about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-08-14 14:56:32 -0700
committerUlrich Drepper <drepper@redhat.com>2010-08-14 14:56:32 -0700
commitca6bb004ebd1cc7da72f1a761ffea377245d1ee9 (patch)
treea9805ea48e75bdb5274c1d1d8eb8bc95184bf604
parent052fa7b33ef5deeb4987e5264cf397b3161d8a01 (diff)
downloadglibc-ca6bb004ebd1cc7da72f1a761ffea377245d1ee9.tar.gz
glibc-ca6bb004ebd1cc7da72f1a761ffea377245d1ee9.tar.xz
glibc-ca6bb004ebd1cc7da72f1a761ffea377245d1ee9.zip
Fix x86-64 build without multiarch.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/multiarch/strcasecmp_l-ssse3.S1
-rw-r--r--sysdeps/x86_64/strcmp.S1
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 02afab13f9..21f9ed7049 100644
--- 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 bc0eb5babd..fb2f9ae14a 100644
--- 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 d36fef225b..1b48f04172 100644
--- 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)