From: Allan McRae <allan@archlinux.org>
Date: Mon, 19 Aug 2013 05:08:05 +0000 (+1000)
Subject: HACK FIX: reinline __m128i_strloadu
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=642c8732a111450a97e4ae41c12a920bc7f02ee0;p=thirdparty%2Fglibc.git

HACK FIX: reinline __m128i_strloadu

After f1d70dad, glibc build for i686-pc-linux-gnu with -O2 experiences
sefaults in __strstr_sse42.

https://bugs.archlinux.org/task/36556
http://sourceware.org/bugzilla/show_bug.cgi?id=15845

Readding the inline "fixes" the issue until a correct solution is found.
---

diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c
index cd63b68c01e..03d8b9a8f44 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))