Fix x86-64 build without multiarch.

diff --git a/ChangeLog b/ChangeLog
index 02afab13f9d272ce1c7fb9e18998b593c75fe627..21f9ed7049f7a4cd36ef3beac30713176f3e32ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-14  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/x86_64/strcmp.S: Move definition of NO_NOLOCALE_ALIAS to...
+       * sysdeps/x86_64/multiarch/strcasecmp_l-ssse3.S: ... here.
+
 2010-08-14  Andreas Schwab  <schwab@linux-m68k.org>
 
        * sysdeps/unix/sysv/linux/prlimit.c: Make it compile.

diff --git a/sysdeps/x86_64/multiarch/strcasecmp_l-ssse3.S b/sysdeps/x86_64/multiarch/strcasecmp_l-ssse3.S
index bc0eb5babd003b48931192d59873b7817aa615d2..fb2f9ae14a304d2885e4d535ad0ae5c77dd2b721 100644 (file)
--- a/sysdeps/x86_64/multiarch/strcasecmp_l-ssse3.S
+++ b/sysdeps/x86_64/multiarch/strcasecmp_l-ssse3.S
@@ -1,5 +1,6 @@
 #define USE_SSSE3 1
 #define USE_AS_STRCASECMP_L
+#define NO_NOLOCALE_ALIAS
 #define STRCMP __strcasecmp_l_ssse3
 #define __strcasecmp __strcasecmp_ssse3
 #include "../strcmp.S"

diff --git a/sysdeps/x86_64/strcmp.S b/sysdeps/x86_64/strcmp.S
index d36fef225bf6661f87736dd6dab16159da5e25ed..1b48f04172c83610c499cdc45f065a57462943ec 100644 (file)
--- a/sysdeps/x86_64/strcmp.S
+++ b/sysdeps/x86_64/strcmp.S
@@ -77,7 +77,6 @@
 # ifndef ENTRY2
 #  define ENTRY2(name) ENTRY (name)
 #  define END2(name) END (name)
-#  define NO_NOLOCALE_ALIAS
 # endif
 
        ENTRY2 (__strcasecmp)