glibc: pull a bug work-around from Arch

This should work around some of our build problems,
e.g. http://hydra.nixos.org/build/7575893/nixlog/1/tail-reload

Cf. #1446
This commit is contained in:
Vladimír Čunát 2014-01-01 15:50:02 +01:00
parent c24cd76ef6
commit c6b92053c9
2 changed files with 16 additions and 0 deletions

View File

@ -67,6 +67,8 @@ stdenv.mkDerivation ({
./cve-2013-4332.patch
./cve-2013-4458.patch
./cve-2013-4788.patch
./strstr-sse42-hack.patch
];
postPatch = ''

View File

@ -0,0 +1,14 @@
https://bugs.archlinux.org/task/36556
diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c
index cd63b68..03d8b9a 100644
--- a/sysdeps/x86_64/multiarch/strstr.c
+++ b/sysdeps/x86_64/multiarch/strstr.c
@@ -86,7 +86,7 @@
/* Simple replacement of movdqu to address 4KB boundary cross issue.
If EOS occurs within less than 16B before 4KB boundary, we don't
cross to next page. */
-static __m128i
+static inline __m128i
__m128i_strloadu (const unsigned char * p, __m128i zero)
{
if (__builtin_expect ((int) ((size_t) p & 0xfff) > 0xff0, 0))