From 59c04e67631d370738b80923d42d4d1539d8f95f Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 1 Oct 2017 15:51:44 -0700 Subject: Mark internal utmp functions with attribute_hidden [BZ #18822] Mark internal utmp functions with attribute_hidden to allow direct access within libc.so and libc.a without using GOT nor PLT. [BZ #18822] * include/utmp.h (__updwtmp): Add libc_hidden_proto. (__getutent): Likewise. (__getutid): Likewise. (__getutline): Likewise. (__pututline): Likewise. (__getutent_r): Likewise. (__getutid_r): Likewise. (__getutline_r): Likewise. (__utmpname): Add attribute_hidden. (__setutent): Likewise. (__endutent): Likewise. * login/getutent.c (__getutent): Add libc_hidden_def. * login/getutent_r.c (__getutent_r): Likewise. (__pututline): Likewise. * login/getutid.c (__getutid): Likewise. * login/getutid_r.c (__getutid_r): Likewise. * login/getutline.c (__getutline): Likewise. * login/getutline_r.c (__getutline_r): Likewise. * login/updwtmp.c (__updwtmp): Likewise. --- include/utmp.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'include/utmp.h') diff --git a/include/utmp.h b/include/utmp.h index 6b2e262..374184e 100644 --- a/include/utmp.h +++ b/include/utmp.h @@ -5,18 +5,26 @@ /* Now define the internal interfaces. */ extern void __updwtmp (const char *__wtmp_file, const struct utmp *__utmp); -extern int __utmpname (const char *__file); +libc_hidden_proto (__updwtmp) +extern int __utmpname (const char *__file) attribute_hidden; extern struct utmp *__getutent (void); -extern void __setutent (void); -extern void __endutent (void); +libc_hidden_proto (__getutent) +extern void __setutent (void) attribute_hidden; +extern void __endutent (void) attribute_hidden; extern struct utmp *__getutid (const struct utmp *__id); +libc_hidden_proto (__getutid) extern struct utmp *__getutline (const struct utmp *__line); +libc_hidden_proto (__getutline) extern struct utmp *__pututline (const struct utmp *__utmp_ptr); +libc_hidden_proto (__pututline) extern int __getutent_r (struct utmp *__buffer, struct utmp **__result); +libc_hidden_proto (__getutent_r) extern int __getutid_r (const struct utmp *__id, struct utmp *__buffer, struct utmp **__result); +libc_hidden_proto (__getutid_r) extern int __getutline_r (const struct utmp *__line, struct utmp *__buffer, struct utmp **__result); +libc_hidden_proto (__getutline_r) libutil_hidden_proto (login_tty) -- cgit v1.1