Skip to content

glibc: pull a bug work-around from Arch (i686-only ATM) #1446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vcunat wants to merge 1 commit into from
Closed

glibc: pull a bug work-around from Arch (i686-only ATM) #1446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkgs/development/libraries/glibc/2.18/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ stdenv.mkDerivation ({
./cve-2013-4332.patch
./cve-2013-4458.patch
./cve-2013-4788.patch
];
]
# the problem only seems to affect i686, so avoid re-hash x86_64 ATM
++ stdenv.lib.optional stdenv.isi686 ./strstr-sse42-hack.patch;

postPatch = ''
# Needed for glibc to build with the gnumake 3.82
Expand Down
14 changes: 14 additions & 0 deletions pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))