diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-17 20:08:22 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-17 20:08:22 +0000 |
| commit | 17c199ee92e4ca8a34a47c42924608a25a444eb2 (patch) | |
| tree | eb24c1f1561542b1540162636d5c55cb48462cbb /inet | |
| parent | c10b9b13f7471b08273effc8cd7e51b119df9348 (diff) | |
| download | glibc-17c199ee92e4ca8a34a47c42924608a25a444eb2.tar.gz glibc-17c199ee92e4ca8a34a47c42924608a25a444eb2.tar.xz glibc-17c199ee92e4ca8a34a47c42924608a25a444eb2.zip | |
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.
Diffstat (limited to 'inet')
| -rw-r--r-- | inet/gethstbyad_r.c | 2 | ||||
| -rw-r--r-- | inet/in6_addr.c | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/inet/gethstbyad_r.c b/inet/gethstbyad_r.c index 72ce441d20..06d39066c1 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 782af6443f..fb7729001d 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) |