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.27.9000-74-g055ac2a
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Feb 2018 21:00:34 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.27.9000-74-g055ac2a
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 055ac2a7eeb14755e946440af3d2cdfe95f18f8e (commit)
from e4452a2d19279d4c90bcafe09ec3cbfd3efe9b6a (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=055ac2a7eeb14755e946440af3d2cdfe95f18f8e
commit 055ac2a7eeb14755e946440af3d2cdfe95f18f8e
Author: Joseph Myers <joseph@codesourcery.com>
Date: Thu Feb 15 21:00:02 2018 +0000
Use libc_hidden_* for argz_next, __argz_next (bug 15105).
Among other localplt test failures when building with -Os, there are
libc.so PLT references for argz_next and __argz_next. This is a
simple case of functions that are inlined for -O2 but not for -Os;
this patch adds libc_hidden_proto / libc_hidden_def for them to avoid
localplt failures even when not inlined.
Tested for x86_64 (both that it removes these particular localplt
failures 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/argz.h (argz_next): Use libc_hidden_proto.
(__argz_next): Likewise.
* string-argz-next.c (__argz_next): Use libc_hidden_def.
(argz_next): Use libc_hidden_weak.
diff --git a/ChangeLog b/ChangeLog
index 1d9e54b..9007cea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2018-02-15 Joseph Myers <joseph@codesourcery.com>
[BZ #15105]
+ * include/argz.h (argz_next): Use libc_hidden_proto.
+ (__argz_next): Likewise.
+ * string-argz-next.c (__argz_next): Use libc_hidden_def.
+ (argz_next): Use libc_hidden_weak.
+
+ [BZ #15105]
* include/sys/socket.h [!_ISOMAC] (__cmsg_nxthdr): Use
libc_hidden_proto.
* sysdeps/unix/sysv/linux/cmsg_nxthdr.c (__cmsg_nxthdr): Use
diff --git a/include/argz.h b/include/argz.h
index 770f02e..e081b2a 100644
--- a/include/argz.h
+++ b/include/argz.h
@@ -39,6 +39,8 @@ extern error_t __argz_replace (char **__restrict __argz,
libc_hidden_proto (argz_delete)
libc_hidden_proto (__argz_count)
libc_hidden_proto (__argz_stringify)
+libc_hidden_proto (argz_next)
+libc_hidden_proto (__argz_next)
# endif /* !_ISOMAC */
#endif
diff --git a/string/argz-next.c b/string/argz-next.c
index abce451..9200eda 100644
--- a/string/argz-next.c
+++ b/string/argz-next.c
@@ -36,4 +36,6 @@ __argz_next (const char *argz, size_t argz_len, const char *entry)
else
return NULL;
}
+libc_hidden_def (__argz_next)
weak_alias (__argz_next, argz_next)
+libc_hidden_weak (argz_next)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
include/argz.h | 2 ++
string/argz-next.c | 2 ++
3 files changed, 10 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources