Author: viric Date: Fri Oct 15 18:00:12 2010 New Revision: 24306 URL: https://svn.nixos.org/websvn/nix/?rev=24306&sc=1
Log: Workaround to overcome the glibc/gcc bug: http://sources.redhat.com/bugzilla/show_bug.cgi?id=12123 I also fixed a wrong comment I had committed in the previous commit. Added: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/disable-strstr-sse42.patch Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix ============================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix Fri Oct 15 17:56:01 2010 (r24305) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix Fri Oct 15 18:00:12 2010 (r24306) @@ -75,8 +75,11 @@ /* 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 = '' Added: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/disable-strstr-sse42.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/disable-strstr-sse42.patch Fri Oct 15 18:00:12 2010 (r24306) @@ -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); _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
