about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2011-09-11 16:47:45 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2011-09-11 16:47:45 +0200
commitdf62b0cd513b56515cb6378b55952696193fc1ef (patch)
treef029337f395db5e7a15c49075274e489cbf6e0c9
parentb8ead09ab7d5eebd3e1596e353622e2235e7deb5 (diff)
downloadglibc-df62b0cd513b56515cb6378b55952696193fc1ef.tar.gz
glibc-df62b0cd513b56515cb6378b55952696193fc1ef.tar.xz
glibc-df62b0cd513b56515cb6378b55952696193fc1ef.zip
m68k: remove use of USE___THREAD
-rw-r--r--ChangeLog.m68k5
-rw-r--r--sysdeps/unix/sysv/linux/m68k/sysdep.h14
2 files changed, 6 insertions, 13 deletions
diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index 8c85d5c81e..9f9950c9de 100644
--- 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 d381189fe5..28113ac5cb 100644
--- 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						      \