m68k: remove use of USE___THREAD

diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index 8c85d5c81ece0c130ce4215f5ee191d0a85dbb30..9f9950c9dedf9a837902a871fd844b4717f74ebb 100644 (file)
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2011-09-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * sysdeps/unix/sysv/linux/m68k/sysdep.h: Remove use of
+       USE___THREAD.
+
 2011-06-23  Andreas Schwab  <schwab@linux-m68k.org>
 
        * sysdeps/m68k/dl-trampoline.S (_dl_runtime_profile)

diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
index d381189fe51147a878a9c38b76c636441909e4e1..28113ac5cb2e9829bcf9cf6cdbc0b236a808a240 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
@@ -106,7 +106,7 @@ SYSCALL_ERROR_LABEL:                                                              \
        a pointer (e.g., mmap).  */                                           \
     move.l %d0, %a0;                                                         \
     rts;
-# elif USE___THREAD
+# elif defined _LIBC_REENTRANT
 #  ifndef NOT_IN_libc
 #   define SYSCALL_ERROR_ERRNO __libc_errno
 #  else
@@ -125,18 +125,6 @@ SYSCALL_ERROR_LABEL:                                                             \
        a pointer (e.g., mmap).  */                                           \
     move.l %d0, %a0;                                                         \
     rts;
-# elif defined _LIBC_REENTRANT
-#  define SYSCALL_ERROR_HANDLER                                                      \
-SYSCALL_ERROR_LABEL:                                                         \
-    neg.l %d0;                                                               \
-    move.l %d0, -(%sp);                                                              \
-    jbsr __errno_location@PLTPC;                                             \
-    move.l (%sp)+, (%a0);                                                    \
-    move.l &-1, %d0;                                                         \
-    /* Copy return value to %a0 for syscalls that are declared to return      \
-       a pointer (e.g., mmap).  */                                           \
-    move.l %d0, %a0;                                                         \
-    rts;
 # else /* !_LIBC_REENTRANT */
 /* Store (- %d0) into errno through the GOT.  */
 #  define SYSCALL_ERROR_HANDLER                                                      \