This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.21-480-g17c199e
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Jun 2015 20:08:48 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-480-g17c199e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 17c199ee92e4ca8a34a47c42924608a25a444eb2 (commit)
from c10b9b13f7471b08273effc8cd7e51b119df9348 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=17c199ee92e4ca8a34a47c42924608a25a444eb2
commit 17c199ee92e4ca8a34a47c42924608a25a444eb2
Author: Joseph Myers <joseph@codesourcery.com>
Date: Wed Jun 17 20:08:22 2015 +0000
Fix gethostbyaddr in6addr_any, in6addr_loopback namespace (bug 18532).
gethostbyaddr brings in references to in6addr_any and thereby
in6addr_loopback, which aren't in all the standards containing
gethostbyaddr (gethostbyaddr is in XPG4 and UNIX98, in6addr_any and
in6addr_loopback are new in POSIX.1:2001). This patch fixes this by
making those symbols into weak aliases (safe in this case, unlike for
most data symbols, because these data symbols are const).
Tested for x86_64 and x86 (testsuite, and comparison of disassembly of
installed stripped shared libraries). Disassembly is unchanged for
x86_64; for x86, I see some changes of stack offsets, but no other
code generation changes or code size differences.
[BZ #18532]
* inet/in6_addr.c (in6addr_any): Rename to __in6addr_any and
define as weak alias of __in6addr_any. Use libc_hidden_data_weak.
(in6addr_loopback): Rename to __in6addr_loopback and define as
weak alias of __in6addr_loopback. Use libc_hidden_data_weak.
* include/netinet/in.h (__in6addr_loopback): Declare. Use
libc_hidden_proto.
(__in6addr_any): Likewise.
* inet/gethstbyad_r.c (PREPROCESS): Use __in6addr_any instead of
in6addr_any.
* conform/Makefile (test-xfail-XPG4/netdb.h/linknamespace): Remove
variable.
(test-xfail-UNIX98/netdb.h/linknamespace): Likewise.
diff --git a/ChangeLog b/ChangeLog
index 29c8a30..bfd78a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2015-06-17 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #18532]
+ * inet/in6_addr.c (in6addr_any): Rename to __in6addr_any and
+ define as weak alias of __in6addr_any. Use libc_hidden_data_weak.
+ (in6addr_loopback): Rename to __in6addr_loopback and define as
+ weak alias of __in6addr_loopback. Use libc_hidden_data_weak.
+ * include/netinet/in.h (__in6addr_loopback): Declare. Use
+ libc_hidden_proto.
+ (__in6addr_any): Likewise.
+ * inet/gethstbyad_r.c (PREPROCESS): Use __in6addr_any instead of
+ in6addr_any.
+ * conform/Makefile (test-xfail-XPG4/netdb.h/linknamespace): Remove
+ variable.
+ (test-xfail-UNIX98/netdb.h/linknamespace): Likewise.
+
2015-06-17 Andrew Senkevich <andrew.senkevich@intel.com>
* bits/libm-simd-decl-stubs.h: Added stubs for pow.
diff --git a/NEWS b/NEWS
index d49bfed..a4a0107 100644
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,7 @@ Version 2.22
18210, 18211, 18217, 18220, 18221, 18234, 18244, 18247, 18287, 18319,
18324, 18333, 18346, 18397, 18409, 18410, 18412, 18418, 18422, 18434,
18444, 18468, 18469, 18470, 18479, 18483, 18495, 18496, 18497, 18498,
- 18507, 18512, 18519, 18520, 18522, 18527, 18528, 18529, 18530.
+ 18507, 18512, 18519, 18520, 18522, 18527, 18528, 18529, 18530, 18532.
* Cache information can be queried via sysconf() function on s390 e.g. with
_SC_LEVEL1_ICACHE_SIZE as argument.
diff --git a/conform/Makefile b/conform/Makefile
index 522249a..9ad7601 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -346,14 +346,12 @@ test-xfail-XOPEN2K8/ndbm.h/linknamespace = yes
# Unsorted expected failures.
test-xfail-XPG3/unistd.h/linknamespace = yes
test-xfail-XPG4/fmtmsg.h/linknamespace = yes
-test-xfail-XPG4/netdb.h/linknamespace = yes
test-xfail-XPG4/syslog.h/linknamespace = yes
test-xfail-XPG4/unistd.h/linknamespace = yes
test-xfail-POSIX/mqueue.h/linknamespace = yes
test-xfail-POSIX/semaphore.h/linknamespace = yes
test-xfail-UNIX98/fmtmsg.h/linknamespace = yes
test-xfail-UNIX98/mqueue.h/linknamespace = yes
-test-xfail-UNIX98/netdb.h/linknamespace = yes
test-xfail-UNIX98/syslog.h/linknamespace = yes
test-xfail-UNIX98/unistd.h/linknamespace = yes
test-xfail-UNIX98/wchar.h/linknamespace = yes
diff --git a/include/netinet/in.h b/include/netinet/in.h
index 6fb5c86..5e37746 100644
--- a/include/netinet/in.h
+++ b/include/netinet/in.h
@@ -5,7 +5,11 @@
#ifndef _ISOMAC
libc_hidden_proto (bindresvport)
libc_hidden_proto (in6addr_loopback)
+extern __typeof (in6addr_loopback) __in6addr_loopback;
+libc_hidden_proto (__in6addr_loopback)
libc_hidden_proto (in6addr_any)
+extern __typeof (in6addr_any) __in6addr_any;
+libc_hidden_proto (__in6addr_any)
#endif
#endif
diff --git a/inet/gethstbyad_r.c b/inet/gethstbyad_r.c
index 72ce441..06d3906 100644
--- a/inet/gethstbyad_r.c
+++ b/inet/gethstbyad_r.c
@@ -32,7 +32,7 @@
be performed. */
#define PREPROCESS \
if (len == sizeof (struct in6_addr) \
- && __builtin_expect (memcmp (&in6addr_any, addr, \
+ && __builtin_expect (memcmp (&__in6addr_any, addr, \
sizeof (struct in6_addr)), 1) == 0) \
{ \
*h_errnop = HOST_NOT_FOUND; \
diff --git a/inet/in6_addr.c b/inet/in6_addr.c
index 782af64..fb77290 100644
--- a/inet/in6_addr.c
+++ b/inet/in6_addr.c
@@ -18,9 +18,13 @@
#include <netinet/in.h>
-const struct in6_addr in6addr_any =
+const struct in6_addr __in6addr_any =
{ { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
-libc_hidden_data_def (in6addr_any)
-const struct in6_addr in6addr_loopback =
+libc_hidden_data_def (__in6addr_any)
+weak_alias (__in6addr_any, in6addr_any)
+libc_hidden_data_weak (in6addr_any)
+const struct in6_addr __in6addr_loopback =
{ { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } };
-libc_hidden_data_def (in6addr_loopback)
+libc_hidden_data_def (__in6addr_loopback)
+weak_alias (__in6addr_loopback, in6addr_loopback)
+libc_hidden_data_weak (in6addr_loopback)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 16 ++++++++++++++++
NEWS | 2 +-
conform/Makefile | 2 --
include/netinet/in.h | 4 ++++
inet/gethstbyad_r.c | 2 +-
inet/in6_addr.c | 12 ++++++++----
6 files changed, 30 insertions(+), 8 deletions(-)
hooks/post-receive
--
GNU C Library master sources