aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-10-03 20:29:57 +0000
committerUlrich Drepper <drepper@redhat.com>2003-10-03 20:29:57 +0000
commitc70a86b618e3e04dcccb7b970ab54da60a27937f (patch)
tree351283f35ab444db26fe22e0232bfafadf1d39ea
parente9a7bbab6b8ae9f9107535dc98eb75dc1c28ffd5 (diff)
downloadglibc-c70a86b618e3e04dcccb7b970ab54da60a27937f.tar
glibc-c70a86b618e3e04dcccb7b970ab54da60a27937f.tar.gz
glibc-c70a86b618e3e04dcccb7b970ab54da60a27937f.tar.bz2
glibc-c70a86b618e3e04dcccb7b970ab54da60a27937f.zip
Update.
2003-10-03 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/elf/bsd-setjmp.S: Use linkonce section for PIC stub. * sysdeps/i386/elf/setjmp.S: Likewise.
-rw-r--r--ChangeLog5
-rw-r--r--nptl/ChangeLog5
-rw-r--r--sysdeps/i386/elf/bsd-setjmp.S17
-rw-r--r--sysdeps/i386/elf/setjmp.S15
4 files changed, 32 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 4cd64040d5..b6205dd3d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-03 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/i386/elf/bsd-setjmp.S: Use linkonce section for PIC stub.
+ * sysdeps/i386/elf/setjmp.S: Likewise.
+
2003-10-02 Roland McGrath <roland@redhat.com>
* argp/argp-help.c (__argp_short_program_name): Move inside [! _LIBC].
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 75cdc3cebd..b958935cc8 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-03 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/i386/pthread_once.S (__pthread_once):
+ Check __sigsetjmp return value. Reported by Daniel Jacobowitz.
+
2003-10-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (DOCARGS_1): Use
diff --git a/sysdeps/i386/elf/bsd-setjmp.S b/sysdeps/i386/elf/bsd-setjmp.S
index c1a833ac1c..72a85b18e1 100644
--- a/sysdeps/i386/elf/bsd-setjmp.S
+++ b/sysdeps/i386/elf/bsd-setjmp.S
@@ -1,5 +1,5 @@
/* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version.
- Copyright (C) 1995,1996,1997,2000,2001,2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1997,2000,2001,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -56,7 +56,7 @@ ENTRY (BP_SYM (setjmp))
we can't save and restore our caller's value. Instead, we do an
indirect jump through the GOT, using for the temporary register
%ecx, which is call-clobbered. */
- call 1f
+ call __i686.get_pc_thunk.cx
addl $_GLOBAL_OFFSET_TABLE_, %ecx
leal C_SYMBOL_NAME (BP_SYM (__sigjmp_save)@GOTOFF)(%ecx), %ecx
call *%ecx
@@ -66,8 +66,13 @@ ENTRY (BP_SYM (setjmp))
popl %ecx
popl %edx
ret
-#ifdef PIC
-1: movl (%esp), %ecx
- ret
-#endif
END (BP_SYM (setjmp))
+
+ .section .gnu.linkonce.t.__i686.get_pc_thunk.cx,"ax",@progbits
+ .globl __i686.get_pc_thunk.cx
+ .hidden __i686.get_pc_thunk.cx
+ .type __i686.get_pc_thunk.cx,@function
+__i686.get_pc_thunk.cx:
+ movl (%esp), %ecx
+ ret
+ .size __i686.get_pc_thunk.cx, . - __i686.get_pc_thunk.cx
diff --git a/sysdeps/i386/elf/setjmp.S b/sysdeps/i386/elf/setjmp.S
index 3f52195017..d6ae98b8b4 100644
--- a/sysdeps/i386/elf/setjmp.S
+++ b/sysdeps/i386/elf/setjmp.S
@@ -1,5 +1,5 @@
/* setjmp for i386, ELF version.
- Copyright (C) 1995,1996,1997,2000,2001,2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1997,2000,2001,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -51,13 +51,20 @@ ENTRY (BP_SYM (__sigsetjmp))
we can't save and restore our caller's value. Instead, we do an
indirect jump through the GOT, using for the temporary register
%ecx, which is call-clobbered. */
- call 1f
+ call __i686.get_pc_thunk.cx
addl $_GLOBAL_OFFSET_TABLE_, %ecx
leal C_SYMBOL_NAME (BP_SYM (__sigjmp_save)@GOTOFF)(%ecx), %ecx
jmp *%ecx
-1: movl (%esp), %ecx
- ret
#else
jmp BP_SYM (__sigjmp_save)
#endif
END (BP_SYM (__sigsetjmp))
+
+ .section .gnu.linkonce.t.__i686.get_pc_thunk.cx,"ax",@progbits
+ .globl __i686.get_pc_thunk.cx
+ .hidden __i686.get_pc_thunk.cx
+ .type __i686.get_pc_thunk.cx,@function
+__i686.get_pc_thunk.cx:
+ movl (%esp), %ecx
+ ret
+ .size __i686.get_pc_thunk.cx, . - __i686.get_pc_thunk.cx