diff options
author | Julien ROZO | 2008-11-07 23:47:42 +0100 |
---|---|---|
committer | Arwed von Merkatz | 2008-11-17 18:02:57 +0100 |
commit | eecf91789439f5eb4ec95b27d90d5442d4f4781a (patch) | |
tree | df27e3369ecd4bcc6da5c2fc87ead2786f498ebc | |
parent | f1adadc9f6207c5f77aefbb5602325fcc18bcc63 (diff) |
glibc: added fnstsw.patch (applied via PRE_BUILD) to fix asm compilation
issue for version 2.7 with latest binutils
(cherry picked from commit 4ea5b6a428c9edbc6c9e475708b9fc4e249da952)
-rw-r--r-- | libs/glibc/HISTORY | 5 | ||||
-rwxr-xr-x | libs/glibc/PRE_BUILD | 8 | ||||
-rw-r--r-- | libs/glibc/fnstsw.patch | 11 |
3 files changed, 24 insertions, 0 deletions
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index 1700090d80..6cff2060b2 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,3 +1,8 @@ +2008-11-07 : Julien "_kaze_" ROZO <julien@rozo.org> + * fnstsw.patch: added, fix asm compilation issue for version 2.7 + with latest binutils + * PRE_BUILD: apply fnstsw.patch + 2008-10-29 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.8 from CVS #14831 diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD index afdf138ac2..9321bccdcc 100755 --- a/libs/glibc/PRE_BUILD +++ b/libs/glibc/PRE_BUILD @@ -68,6 +68,14 @@ if [[ "$GLIBC_CVS" != "y" ]]; then autoconf fi && +# +# Fix for fnstsw asm issue with latest binutils +# http://sourceware.org/ml/binutils/2008-01/msg00151.html +# +if [[ "$GLIBC_CVS" != "y" ]]; then + patch -p1 < $SCRIPT_DIRECTORY/fnstsw.patch +fi && + # disabled libgd detection/building memusagestat for now until a better # fix has been found, bug #8277 sedit 's/LIBGD=yes/LIBGD=no/' $SOURCE_DIRECTORY/configure && diff --git a/libs/glibc/fnstsw.patch b/libs/glibc/fnstsw.patch new file mode 100644 index 0000000000..89a71f6d71 --- /dev/null +++ b/libs/glibc/fnstsw.patch @@ -0,0 +1,11 @@ +--- glibc-2.7.old/sysdeps/i386/fpu/ftestexcept.c 2004-03-05 11:14:48.000000000 +0100 ++++ glibc-2.7/sysdeps/i386/fpu/ftestexcept.c 2008-11-07 23:45:48.000000000 +0100 +@@ -26,7 +26,7 @@ + int + fetestexcept (int excepts) + { +- int temp; ++ short temp; + int xtemp = 0; + + /* Get current exceptions. */ |