diff options
| -rw-r--r-- | ChangeLog.alpha | 4 | ||||
| -rw-r--r-- | sysdeps/unix/alpha/sysdep.h | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog.alpha b/ChangeLog.alpha index 5b4be14df3..eb5544cbb3 100644 --- a/ChangeLog.alpha +++ b/ChangeLog.alpha @@ -1,5 +1,9 @@ 2012-02-15 Richard Henderson <rth@twiddle.net> + * sysdeps/unux/alpha/sysdep.h: Don't include <tls.h> + [PIC] (SYSCALL_ERROR_HANDLER): Emit nothing. + [PIC] (SYSCALL_ERROR_LABEL): Add !samegp markup. + * sysdeps/alpha/dl-machine.h: Don't check USE___THREAD. * sysdeps/unix/alpha/sysdeps.S: Don't check __ELF__, USE___THREAD, diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h index 224c95d3b5..e82784225b 100644 --- a/sysdeps/unix/alpha/sysdep.h +++ b/sysdeps/unix/alpha/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995, 1996, 2000, 2003, 2004, 2006, 2010 +/* Copyright (C) 1992, 1995, 1996, 2000, 2003, 2004, 2006, 2010, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Brendan Kehoe (brendan@zen.org). @@ -28,8 +28,6 @@ # include <regdef.h> #endif -#include <tls.h> /* Defines USE___THREAD. */ - #ifdef IS_IN_rtld # include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */ #endif @@ -86,9 +84,8 @@ lda v0, -1; \ ret #elif defined(PIC) -# define SYSCALL_ERROR_LABEL __syscall_error -# define SYSCALL_ERROR_HANDLER \ - br $31, __syscall_error !samegp +# define SYSCALL_ERROR_LABEL __syscall_error !samegp +# define SYSCALL_ERROR_HANDLER #else # define SYSCALL_ERROR_LABEL $syscall_error # define SYSCALL_ERROR_HANDLER \ |