qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2000-06-01  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/i386/elf/setjmp.S: Work around change is recent
	binutils.  gas now emits a jump through the PLT instead of a
	relative jump if the jump target is an exported symbol.
This commit is contained in:
Ulrich Drepper 2000-06-01 07:14:15 +00:00
parent 9f97f790ea
commit 61d655c1cb
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2000-06-01 Ulrich Drepper <drepper@redhat.com>
* sysdeps/i386/elf/setjmp.S: Work around change is recent
binutils. gas now emits a jump through the PLT instead of a
relative jump if the jump target is an exported symbol.
2000-05-31 Ulrich Drepper <drepper@redhat.com> 2000-05-31 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/aix/aix-termios.h: Define AIX_CBAUD. * sysdeps/unix/sysv/linux/powerpc/aix/aix-termios.h: Define AIX_CBAUD.

8
sysdeps/i386/elf/setjmp.S
View File

@ -1,5 +1,5 @@
/* setjmp for i386, ELF version. /* setjmp for i386, ELF version.
Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -31,7 +31,10 @@ ENTRY (setjmp)
pushl $1 /* Push second argument of zero. */ pushl $1 /* Push second argument of zero. */
pushl %ecx /* Push back first argument. */ pushl %ecx /* Push back first argument. */
pushl %eax /* Push back return PC. */ pushl %eax /* Push back return PC. */
jmp __sigsetjmp /* Note that we have to use a non-exported symbol in the next
jump since otherwise gas will emit it as a jump through the
PLT which is what we cannot use here. */
jmp .Linternal_sigsetjmp
END (setjmp) END (setjmp)
/* Binary compatibility entry point. */ /* Binary compatibility entry point. */
@ -45,6 +48,7 @@ ENTRY (__setjmp)
pushl %eax /* Push back return address. */ pushl %eax /* Push back return address. */
ENTRY (__sigsetjmp) ENTRY (__sigsetjmp)
.Linternal_sigsetjmp = __sigsetjmp
movl 4(%esp), %eax /* User's jmp_buf in %eax. */ movl 4(%esp), %eax /* User's jmp_buf in %eax. */
/* Save registers. */ /* Save registers. */
movl %ebx, (JB_BX*4)(%eax) movl %ebx, (JB_BX*4)(%eax)

2
wcsmbs/wcsmbsload.c
View File

@ -144,7 +144,7 @@ __wcsmbs_load_conv (const struct locale_data *new_category)
/* Acquire the lock. */ /* Acquire the lock. */
__libc_lock_lock (lock); __libc_lock_lock (lock);
/* We should repest the test since while we waited some other thread /* We should repeat the test since while we waited some other thread
might have run this function. */ might have run this function. */
if (__wcsmbs_last_locale != new_category) if (__wcsmbs_last_locale != new_category)
{ {