From: Dmitry V. Levin <ldv@altlinux.org>
Date: Thu, 21 Mar 2013 23:02:37 +0000 (+0000)
Subject: BZ#11120: fix x86_64/strcmp.S NOT_IN_libc safeguards
X-Git-Tag: glibc-2.18~478
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e0fb52187504fad6657c9462ce650a540d5e387;p=thirdparty%2Fglibc.git

BZ#11120: fix x86_64/strcmp.S NOT_IN_libc safeguards

Due to a typo repeated several times, this bug hasn't been fixed yet,
despite being marked as resolved in glibc 2.12.

* sysdeps/x86_64/strcmp.S: Replace all occurrences of NOT_IN_lib
with NOT_IN_libc.
---

diff --git a/ChangeLog b/ChangeLog
index 9f4aba18321..de9e54e2f7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-21  Dmitry V. Levin  <ldv@altlinux.org>
+
+	[BZ #11120]
+	* sysdeps/x86_64/strcmp.S: Replace all occurrences of NOT_IN_lib
+	with NOT_IN_libc.
+
 2013-03-21  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/fpu/w_sqrt.c (compat_symbol): Add sqrtl compat
diff --git a/NEWS b/NEWS
index fe3f0b79115..f0965d65e12 100644
--- a/NEWS
+++ b/NEWS
@@ -9,10 +9,10 @@ Version 2.18
 
 * The following bugs are resolved with this release:
 
-  11561, 12723, 13550, 13951, 14142, 14176, 14200, 14317, 14327, 14496,
-  14812, 14920, 14964, 14981, 14982, 14985, 14994, 14996, 15003, 15006,
-  15020, 15023, 15036, 15054, 15055, 15062, 15078, 15160, 15232, 15234,
-  15283, 15285, 15287.
+  11120, 11561, 12723, 13550, 13951, 14142, 14176, 14200, 14317, 14327,
+  14496, 14812, 14920, 14964, 14981, 14982, 14985, 14994, 14996, 15003,
+  15006, 15020, 15023, 15036, 15054, 15055, 15062, 15078, 15160, 15232,
+  15234, 15283, 15285, 15287.
 
 * Add support for calling C++11 thread_local object destructors on thread
   and program exit.  This needs compiler support for offloading C++11
@@ -372,10 +372,10 @@ Version 2.12
 
 * The following bugs are resolved with this release:
 
-  3662, 4457, 5553, 10162, 10401, 10414, 10554, 10824, 10864, 10915, 10918,
-  10936, 10939, 10958, 10968, 10969, 10972, 10992, 11000, 11001, 11007,
-  11010, 11027, 11039, 11040, 11041, 11043, 11046, 11056, 11070, 11093,
-  11115, 11120, 11125, 11126, 11127, 11134, 11141, 11149, 11183, 11184,
+  3662, 4457, 5553, 10162, 10401, 10414, 10554, 10824, 10864, 10915,
+  10918, 10936, 10939, 10958, 10968, 10969, 10972, 10992, 11000, 11001,
+  11007, 11010, 11027, 11039, 11040, 11041, 11043, 11046, 11056, 11070,
+  11093, 11115, 11125, 11126, 11127, 11134, 11141, 11149, 11183, 11184,
   11185, 11186, 11187, 11188, 11189, 11190, 11191, 11192, 11193, 11194,
   11200, 11230, 11235, 11242, 11254, 11258, 11271, 11272, 11276, 11279,
   11287, 11292, 11319, 11332, 11333, 11387, 11389, 11390, 11394, 11397,
diff --git a/sysdeps/x86_64/strcmp.S b/sysdeps/x86_64/strcmp.S
index de9ecc909e4..76809373e85 100644
--- a/sysdeps/x86_64/strcmp.S
+++ b/sysdeps/x86_64/strcmp.S
@@ -32,7 +32,7 @@
 /* The simplified code below is not set up to handle strncmp() so far.
    Should this become necessary it has to be implemented.  For now
    just report the problem.  */
-# ifdef NOT_IN_lib
+# ifdef NOT_IN_libc
 #  error "strncmp not implemented so far"
 # endif
 
@@ -51,7 +51,7 @@
 # include "locale-defines.h"
 
 /* No support for strcasecmp outside libc so far since it is not needed.  */
-# ifdef NOT_IN_lib
+# ifdef NOT_IN_libc
 #  error "strcasecmp_l not implemented so far"
 # endif
 
@@ -60,7 +60,7 @@
 # include "locale-defines.h"
 
 /* No support for strncasecmp outside libc so far since it is not needed.  */
-# ifdef NOT_IN_lib
+# ifdef NOT_IN_libc
 #  error "strncasecmp_l not implemented so far"
 # endif