about summary refs log tree commit diff
path: root/libio
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2018-02-21 18:01:11 +0000
committerJoseph Myers <joseph@codesourcery.com>2018-02-21 18:01:11 +0000
commit30ac923dbe7d0c16df8a368150ecd736557508f4 (patch)
treee706b9fa5aac39b4b5aa4357020de158bc4a338d /libio
parent7ec5f9465e732e668d0dc94ac078ba68056d6d0a (diff)
downloadglibc-30ac923dbe7d0c16df8a368150ecd736557508f4.tar.gz
glibc-30ac923dbe7d0c16df8a368150ecd736557508f4.tar.xz
glibc-30ac923dbe7d0c16df8a368150ecd736557508f4.zip
Fix -Os getc_unlocked linknamespace, localplt issues (bug 15105, bug 19463).
Continuing the fixes for linknamespace and localplt test failures with
-Os that arise from functions not being inlined in that case, this
patch fixes such failures for getc_unlocked.

__getc_unlocked already exists; this patch makes it explicitly hidden,
calls it where needed for namespace reasons, adds an inline function
for it when inline functions are used and adds libc_hidden_proto /
libc_hidden_weak for getc_unlocked.

Tested for x86_64 (both without -Os to make sure that case continues
to work, and with -Os to make sure all the relevant linknamespace and
localplt test failures are resolved).  Because of other such failures
that remain after this patch, neither of the bugs can yet be closed.

	[BZ #15105]
	[BZ #19463]
	* libio/getc_u.c (getc_unlocked): Use libc_hidden_weak.
	* include/stdio.h [!_ISOMAC] (__getc_unlocked): Use
	attribute_hidden, and define inline if [__USE_EXTERN_INLINES].
	[!_ISOMAC] (getc_unlocked): Use libc_hidden_proto.
	* misc/getttyent.c (__getttyent): Call __getc_unlocked instead of
	getc_unlocked.
	* time/tzfile.c (__tzfile_read): Likewise.
Diffstat (limited to 'libio')
-rw-r--r--libio/getc_u.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libio/getc_u.c b/libio/getc_u.c
index 7d50332e42..ce2bb88849 100644
--- a/libio/getc_u.c
+++ b/libio/getc_u.c
@@ -37,4 +37,5 @@ __getc_unlocked (FILE *fp)
 }
 
 weak_alias (__getc_unlocked, getc_unlocked)
+libc_hidden_weak (getc_unlocked)
 weak_alias (__getc_unlocked, fgetc_unlocked)