public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround to overcome the glibc/gcc bug:

Browse Source 
http://sources.redhat.com/bugzilla/show_bug.cgi?id=12123

I also fixed a wrong comment I had committed in the previous commit.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24306
This commit is contained in:
Lluís Batlle i Rossell 2010-10-15 18:00:12 +00:00
parent 9ed84bc432
commit 6b35b69a28
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/glibc-2.12/common.nix
View File

@ -75,8 +75,11 @@ stdenv.mkDerivation ({
/* Allow nixos and nix handle the locale-archive. */
./nix-locale-archive.patch
/* Allow nixos and nix handle the locale-archive. */
/* A fix for a glibc nscd linking bug, reported upstream already.*/
./nscd-ssp-linking.patch
/* Workaround for a glibc bug reported upstraem already */
./disable-strstr-sse42.patch
];
postPatch = ''

14
pkgs/development/libraries/glibc-2.12/disable-strstr-sse42.patch Normal file
View File

@ -0,0 +1,14 @@
Workaround for http://sources.redhat.com/bugzilla/show_bug.cgi?id=12123
diff --git a/sysdeps/i386/i686/multiarch/strstr-c.c b/sysdeps/i386/i686/multiarch/strstr-c.c
index efa9f78..cd34a88 100644
--- a/sysdeps/i386/i686/multiarch/strstr-c.c
+++ b/sysdeps/i386/i686/multiarch/strstr-c.c
@@ -10,4 +10,6 @@
extern char *__strstr_sse42 (const char *, const char *) attribute_hidden;
extern __typeof (__strstr_ia32) __strstr_ia32 attribute_hidden;
-libc_ifunc (strstr, HAS_SSE4_2 ? __strstr_sse42 : __strstr_ia32);
+// Disabled any sse42, due to a bug:
+// http://sources.redhat.com/bugzilla/show_bug.cgi?id=12123
+libc_ifunc (strstr, __strstr_ia32);