diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-05-21 08:48:21 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-05-21 08:48:21 +0000 |
| commit | 5e6f34c2a01533c0b64e0b8c44c29a434613187d (patch) | |
| tree | 95eefa4e4fa705f5bc289bde66af3adff3e06f9f | |
| parent | b72f5692e8c8aebc2e053f9f292ca5fc4ace09e2 (diff) | |
| download | glibc-5e6f34c2a01533c0b64e0b8c44c29a434613187d.tar.gz glibc-5e6f34c2a01533c0b64e0b8c44c29a434613187d.tar.xz glibc-5e6f34c2a01533c0b64e0b8c44c29a434613187d.zip | |
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
(CALL_ERRNO_LOCATION): Define. (__SYSCALL_STRING, __CLONE_SYSCALL_STRING): Use it. * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h (CALL_ERRNO_LOCATION): Define. (__SYSCALL_STRING, __CLONE_SYSCALL_STRING): Use it. * sysdeps/unix/sysv/linux/sparc/sparc64/brk.S (__brk): Use HIDDEN_JUMPTARGET for __errno_location call in libc.so. 2008-05-21 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (CALL_ERRNO_LOCATION): Define. (__SYSCALL_STRING, __CLONE_SYSCALL_STRING): Use it. * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h (CALL_ERRNO_LOCATION): Define. (__SYSCALL_STRING, __CLONE_SYSCALL_STRING): Use it. * sysdeps/unix/sysv/linux/sparc/sparc64/brk.S (__brk): Use HIDDEN_JUMPTARGET for __errno_location call in libc.so.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/brk.S | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h | 13 |
4 files changed, 37 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index bb9b90b6da..abf2caa8bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-05-21 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h + (CALL_ERRNO_LOCATION): Define. + (__SYSCALL_STRING, __CLONE_SYSCALL_STRING): Use it. + * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h + (CALL_ERRNO_LOCATION): Define. + (__SYSCALL_STRING, __CLONE_SYSCALL_STRING): Use it. + * sysdeps/unix/sysv/linux/sparc/sparc64/brk.S (__brk): Use + HIDDEN_JUMPTARGET for __errno_location call in libc.so. + 2008-05-20 Ulrich Drepper <drepper@redhat.com> * include/inline-hashtab.h (higher_prime_number): Fix type of mid diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h index c808a97fc5..1f674c1fbe 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1997, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2002, 2003, 2004, 2006, 2008 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, January 1997. @@ -89,6 +90,13 @@ ENTRY(name); \ #else /* __ASSEMBLER__ */ +#if defined SHARED && defined DO_VERSIONING && defined PIC \ + && !defined NO_HIDDEN && !defined NOT_IN_libc +# define CALL_ERRNO_LOCATION "call __GI___errno_location;" +#else +# define CALL_ERRNO_LOCATION "call __errno_location;" +#endif + #define __SYSCALL_STRING \ "ta 0x10;" \ "bcs 2f;" \ @@ -97,7 +105,7 @@ ENTRY(name); \ ".subsection 2;" \ "2:" \ "save %%sp, -192, %%sp;" \ - "call __errno_location;" \ + CALL_ERRNO_LOCATION \ " nop;" \ "st %%i0,[%%o0];" \ "ba 1b;" \ @@ -113,7 +121,7 @@ ENTRY(name); \ ".subsection 2;" \ "2:" \ "save %%sp, -192, %%sp;" \ - "call __errno_location;" \ + CALL_ERRNO_LOCATION \ " nop;" \ "st %%i0, [%%o0];" \ "ba 1b;" \ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S b/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S index 134ce789f7..ccc5589927 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson <richard@gnu.ai.mit.edu>, 1997. @@ -86,7 +86,11 @@ ENTRY (__brk) #endif st %o0, [%g1] #else +#ifndef NOT_IN_libc + call HIDDEN_JUMPTARGET(__errno_location) +#else call __errno_location +#endif mov %o0,%l1 st %l1, [%o0] #endif diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h index f156f9241a..6bb061319e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2000, 2002, 2003, 2004, 2006 +/* Copyright (C) 1997, 2000, 2002, 2003, 2004, 2006, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson <richard@gnu.ai.mit.edu>, 1997. @@ -106,12 +106,19 @@ ENTRY(name); \ #else /* __ASSEMBLER__ */ +#if defined SHARED && defined DO_VERSIONING && defined PIC \ + && !defined NO_HIDDEN && !defined NOT_IN_libc +# define CALL_ERRNO_LOCATION "call __GI___errno_location;" +#else +# define CALL_ERRNO_LOCATION "call __errno_location;" +#endif + #define __SYSCALL_STRING \ "ta 0x6d;" \ "bcc,pt %%xcc, 1f;" \ " nop;" \ "save %%sp, -192, %%sp;" \ - "call __errno_location;" \ + CALL_ERRNO_LOCATION \ " nop;" \ "st %%i0,[%%o0];" \ "restore %%g0, -1, %%o0;" \ @@ -122,7 +129,7 @@ ENTRY(name); \ "bcc,pt %%xcc, 1f;" \ " sub %%o1, 1, %%o1;" \ "save %%sp, -192, %%sp;" \ - "call __errno_location;" \ + CALL_ERRNO_LOCATION \ " mov -1, %%i1;" \ "st %%i0,[%%o0];" \ "restore %%g0, -1, %%o0;" \ |