about summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2018-02-15 20:59:12 +0000
committerJoseph Myers <joseph@codesourcery.com>2018-02-15 20:59:12 +0000
commite4452a2d19279d4c90bcafe09ec3cbfd3efe9b6a (patch)
treed63b0749bb43c54953a0c9b228ad33a74cd3b5a3 /include
parent499b315324519f8deb5b42a143a76319934a3ab0 (diff)
downloadglibc-e4452a2d19279d4c90bcafe09ec3cbfd3efe9b6a.tar.gz
glibc-e4452a2d19279d4c90bcafe09ec3cbfd3efe9b6a.tar.xz
glibc-e4452a2d19279d4c90bcafe09ec3cbfd3efe9b6a.zip
Use libc_hidden_* for __cmsg_nxthdr (bug 15105).
Among other localplt test failures when building with -Os, there are
libc.so PLT references for __cmsg_nxthdr.  This is a simple case of a
function that is inlined for -O2 but not for -Os; this patch adds
libc_hidden_proto / libc_hidden_def for it to avoid a localplt failure
even when it is not inlined.

Tested for x86_64 (both that it removes this particular localplt
failure for -Os - but other such failures remain so the bug can't yet
be closed - and that the testsuite continues to pass without -Os).

	[BZ #15105]
	* include/sys/socket.h [!_ISOMAC] (__cmsg_nxthdr): Use
	libc_hidden_proto.
	* sysdeps/unix/sysv/linux/cmsg_nxthdr.c (__cmsg_nxthdr): Use
	libc_hidden_def.
Diffstat (limited to 'include')
-rw-r--r--include/sys/socket.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sys/socket.h b/include/sys/socket.h
index baec6e6439..26db0e0d77 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -154,5 +154,7 @@ libc_hidden_proto (__libc_sa_len)
 # define SA_LEN(_x)      __libc_sa_len((_x)->sa_family)
 #endif
 
+libc_hidden_proto (__cmsg_nxthdr)
+
 #endif
 #endif