diff options
author | Eric Sandall | 2007-10-01 15:10:08 -0700 |
---|---|---|
committer | Eric Sandall | 2007-10-01 15:10:08 -0700 |
commit | a151291249b30459d3f764bfc28e0bdffafe927a (patch) | |
tree | 01effe07a08eb6d9e903f579ac453bead50ebf1c | |
parent | 4779d773e70572442679da00cdc84fefc638f34a (diff) |
Revert "glibc more iffy merges from 2.6.1 update not needed patches"
This reverts commit 7a4530f0ecc479570e724f5537aaa0999075bfc1.
Reverting glibc 2.6 for stable-rc-0.14
-rw-r--r-- | libs/glibc/HISTORY | 1 | ||||
-rwxr-xr-x | libs/glibc/PRE_BUILD | 1 | ||||
-rw-r--r-- | libs/glibc/glibcshared.patch | 12 |
3 files changed, 13 insertions, 1 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index f624646a78..3294b762e5 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -2,7 +2,6 @@ * PRE_BUILD: nisplus_fix.diff and iconv_open.patch removed not needed * nisplus_fix.diff: removed * iconv_open.patch: removed - * glibcshared.patch: removed for same reason 2007-09-16 David Brown <dmlb2000@gmail.com> * DETAILS: removed GLIBC_ARCH altogether diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD index 19cef96983..90b4daedc3 100755 --- a/libs/glibc/PRE_BUILD +++ b/libs/glibc/PRE_BUILD @@ -52,6 +52,7 @@ fi && # Now fixup the normal glibc # cd $SOURCE_DIRECTORY && +patch -p1 < $SCRIPT_DIRECTORY/glibcshared.patch && patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch && patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch && diff --git a/libs/glibc/glibcshared.patch b/libs/glibc/glibcshared.patch new file mode 100644 index 0000000000..5c2f22a413 --- /dev/null +++ b/libs/glibc/glibcshared.patch @@ -0,0 +1,12 @@ +diff -Naur glibc-2.3.5.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.3.5/sysdeps/unix/sysv/linux/i386/sysdep.h +--- glibc-2.3.5.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2005-04-11 11:06:13.530536216 -0700 ++++ glibc-2.3.5/sysdeps/unix/sysv/linux/i386/sysdep.h 2005-04-11 11:08:00.636253672 -0700 +@@ -454,7 +454,7 @@ + + #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 \ |