about summary refs log tree commit diff
path: root/sysdeps/x86_64/multiarch
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-02-07 14:44:18 -0800
committerRoland McGrath <roland@hack.frob.com>2013-02-07 14:44:18 -0800
commitf1d70dad5381352b3cad04b5ee0dd0efe2627683 (patch)
tree09ee58dd09a6fd5f18131b98cc337a001e90fcb2 /sysdeps/x86_64/multiarch
parent7bd642f580ef5698bd5b1777a5ba7af2f58c5d8c (diff)
downloadglibc-f1d70dad5381352b3cad04b5ee0dd0efe2627683.tar.gz
glibc-f1d70dad5381352b3cad04b5ee0dd0efe2627683.tar.xz
glibc-f1d70dad5381352b3cad04b5ee0dd0efe2627683.zip
Remove lots of inline keywords.
Diffstat (limited to 'sysdeps/x86_64/multiarch')
-rw-r--r--sysdeps/x86_64/multiarch/strcasestr-nonascii.c2
-rw-r--r--sysdeps/x86_64/multiarch/strstr.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/sysdeps/x86_64/multiarch/strcasestr-nonascii.c b/sysdeps/x86_64/multiarch/strcasestr-nonascii.c
index 85b7b35753..032a6420d6 100644
--- a/sysdeps/x86_64/multiarch/strcasestr-nonascii.c
+++ b/sysdeps/x86_64/multiarch/strcasestr-nonascii.c
@@ -22,7 +22,7 @@
 
 /* Similar to __m128i_strloadu.  Convert to lower case for none-POSIX/C
    locale.  */
-static inline __m128i
+static __m128i
 __m128i_strloadu_tolower (const unsigned char *p)
 {
   union
diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c
index 1cc015d0c1..cd63b68c01 100644
--- a/sysdeps/x86_64/multiarch/strstr.c
+++ b/sysdeps/x86_64/multiarch/strstr.c
@@ -82,11 +82,11 @@
    5.  failed string compare, go back to scanning
  */
 
+#if !(defined USE_AS_STRCASESTR && defined STRCASESTR_NONASCII)
 /* 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 inline __m128i
+static __m128i
 __m128i_strloadu (const unsigned char * p, __m128i zero)
 {
   if (__builtin_expect ((int) ((size_t) p & 0xfff) > 0xff0, 0))
@@ -99,13 +99,14 @@ __m128i_strloadu (const unsigned char * p, __m128i zero)
     }
   return _mm_loadu_si128 ((__m128i *) p);
 }
+#endif
 
 #if defined USE_AS_STRCASESTR && !defined STRCASESTR_NONASCII
 
 /* Similar to __m128i_strloadu.  Convert to lower case for POSIX/C
    locale and other which have single-byte letters only in the ASCII
    range.  */
-static inline __m128i
+static __m128i
 __m128i_strloadu_tolower (const unsigned char *p, __m128i zero, __m128i uclow,
 			  __m128i uchigh, __m128i lcqword)
 {