about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-04-01 19:56:00 +0000
committerUlrich Drepper <drepper@redhat.com>2006-04-01 19:56:00 +0000
commita44cffaa1235dc9e46c3d8174961eb4793c391ac (patch)
treed51550a07f6e3bd66e930902500b26f9f986b9c2
parent1f8f2b608cd0a19e924849a3df8bdba29c8063c5 (diff)
downloadglibc-a44cffaa1235dc9e46c3d8174961eb4793c391ac.tar.gz
glibc-a44cffaa1235dc9e46c3d8174961eb4793c391ac.tar.xz
glibc-a44cffaa1235dc9e46c3d8174961eb4793c391ac.zip
[BZ #2477]
	* sysdeps/unix/sysv/linux/i386/sysdep.h: Create correct LOADARGS_*
	macros for non-shared position-independent code.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/unix/sysv/linux/i386/sysdep.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cc94216eb5..97043e253b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-04-01  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #2477]
+	* sysdeps/unix/sysv/linux/i386/sysdep.h: Create correct LOADARGS_*
+	macros for non-shared position-independent code.
+
 	[BZ #2472]
 	* bits/siginfo.h: Fix typo in ILL_ILLOPN definition.
 
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index cb5767955c..90423d8434 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1993,1995,1996,1997,1998,1999,2000,2002,2003,2004,2005
+/* Copyright (C) 1992,1993,1995-2000,2002-2005,2006
    	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper, <drepper@gnu.org>, August 1995.
@@ -447,7 +447,7 @@ asm (".L__X'%ebx = 1\n\t"
 
 #define LOADARGS_0
 #ifdef __PIC__
-# if defined I386_USE_SYSENTER
+# if defined I386_USE_SYSENTER && defined SHARED
 #  define LOADARGS_1 \
     "bpushl .L__X'%k3, %k3\n\t"
 #  define LOADARGS_5 \