From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 14 Aug 2010 21:56:32 +0000 (-0700)
Subject: Fix x86-64 build without multiarch.
X-Git-Tag: glibc-2.13~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca6bb004ebd1cc7da72f1a761ffea377245d1ee9;p=thirdparty%2Fglibc.git

Fix x86-64 build without multiarch.
---

diff --git a/ChangeLog b/ChangeLog
index 02afab13f9d..21f9ed7049f 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 bc0eb5babd0..fb2f9ae14a3 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 d36fef225bf..1b48f04172c 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)