From: Joseph Myers <joseph@codesourcery.com>
Date: Sun, 14 Jun 2015 14:32:07 +0000 (+0000)
Subject: Fix linknamespace expectations for in6addr_any, in6addr_loopback.
X-Git-Tag: glibc-2.22~199
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=bf1435783d5031e54f2f74ba3028db3c225a9da8;p=glibc.git

Fix linknamespace expectations for in6addr_any, in6addr_loopback.

Some linknamespace test failures turned out to be because the
variables in6addr_any and in6addr_loopback weren't listed in the lists
of extra reserved symbols for the relevant standards (only functions
are handled automatically through -aux-info, data symbols need listing
manually in list-header-symbols.pl).  This patch duly adds those
symbols to those lists (there are still failures for older standards
because of references to those symbols being brought in for standards
that didn't reserve them: bug 18532, to be fixed separately).

Tested for x86_64.

	* conform/list-header-symbols.pl (%extra_syms): Add in6addr_any
	and in6addr_loopback for XOPEN2K, XOPEN2K8 and POSIX2008.
	* conform/Makefile (test-xfail-XOPEN2K/netdb.h/linknamespace):
	Remove variable.
	(test-xfail-POSIX2008/netdb.h/linknamespace): Likewise.
	(test-xfail-XOPEN2K8/netdb.h/linknamespace): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 62302505d7..fdcc2e9276 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-06-14  Joseph Myers  <joseph@codesourcery.com>
+
+	* conform/list-header-symbols.pl (%extra_syms): Add in6addr_any
+	and in6addr_loopback for XOPEN2K, XOPEN2K8 and POSIX2008.
+	* conform/Makefile (test-xfail-XOPEN2K/netdb.h/linknamespace):
+	Remove variable.
+	(test-xfail-POSIX2008/netdb.h/linknamespace): Likewise.
+	(test-xfail-XOPEN2K8/netdb.h/linknamespace): Likewise.
+
 2015-06-12  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #18530]
diff --git a/conform/Makefile b/conform/Makefile
index ea7a6b4b33..522249ad6a 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -358,10 +358,7 @@ test-xfail-UNIX98/syslog.h/linknamespace = yes
 test-xfail-UNIX98/unistd.h/linknamespace = yes
 test-xfail-UNIX98/wchar.h/linknamespace = yes
 test-xfail-XOPEN2K/fmtmsg.h/linknamespace = yes
-test-xfail-XOPEN2K/netdb.h/linknamespace = yes
 test-xfail-XOPEN2K/syslog.h/linknamespace = yes
-test-xfail-POSIX2008/netdb.h/linknamespace = yes
 test-xfail-POSIX2008/semaphore.h/linknamespace = yes
 test-xfail-XOPEN2K8/fmtmsg.h/linknamespace = yes
-test-xfail-XOPEN2K8/netdb.h/linknamespace = yes
 test-xfail-XOPEN2K8/syslog.h/linknamespace = yes
diff --git a/conform/list-header-symbols.pl b/conform/list-header-symbols.pl
index b001305ffb..8b14b83706 100644
--- a/conform/list-header-symbols.pl
+++ b/conform/list-header-symbols.pl
@@ -55,13 +55,14 @@ $extra_syms{"UNIX98"} = ["errno", "setjmp", "va_end", "environ", "signgam",
 $extra_syms{"XOPEN2K"} = ["errno", "setjmp", "va_end", "environ", "signgam",
 			  "sigsetjmp", "optarg", "optind", "opterr", "optopt",
 			  "daylight", "timezone", "tzname", "getdate_err",
-			  "h_errno"];
+			  "h_errno", "in6addr_any", "in6addr_loopback"];
 $extra_syms{"XOPEN2K8"} = ["errno", "setjmp", "va_end", "environ", "signgam",
 			   "sigsetjmp", "optarg", "optind", "opterr", "optopt",
-			   "daylight", "timezone", "tzname", "getdate_err"];
+			   "daylight", "timezone", "tzname", "getdate_err",
+			   "in6addr_any", "in6addr_loopback"];
 $extra_syms{"POSIX2008"} = ["errno", "setjmp", "va_end", "environ",
 			    "sigsetjmp", "optarg", "optind", "opterr", "optopt",
-			    "tzname"];
+			    "tzname", "in6addr_any", "in6addr_loopback"];
 
 %user_syms = ();