Patchwork [3/3] Mark internel unistd functions hidden

login
register
mail settings
Submitter H.J. Lu
Date Oct. 18, 2015, 5:25 p.m.
Message ID <1445189141-18068-3-git-send-email-hjl.tools@gmail.com>
Download mbox | patch
Permalink /patch/9218/
State New
Headers show

Comments

H.J. Lu - Oct. 18, 2015, 5:25 p.m.
Since internal unistd functions are only used internally in ld.so and
libc.so, they can be made hidden.

	[BZ #19122]
	* include/unistd.h (__libc_check_standard_fds): Add
	attribute_hidden.
	IS_IN (rtld)] (__access): Likewise.
	IS_IN (rtld)] (__brk): Likewise.
	IS_IN (rtld)] (__lseek): Likewise.
	IS_IN (rtld)] (__profil): Likewise.
	IS_IN (rtld)] (__read): Likewise.
	IS_IN (rtld)] (__sbrk): Likewise.
	IS_IN (rtld)] (__close): Add attribute_hidden if not compiling
	for Hurd.
	IS_IN (rtld)] (__getcwd): Likewise.
	IS_IN (rtld)] (__getpid): Likewise.
	IS_IN (rtld)] (__libc_read): Likewise.
	IS_IN (rtld)] (__libc_write): Likewise.
---
 include/unistd.h | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)
Roland McGrath - Oct. 19, 2015, 6:31 p.m.
NAK to #ifdef in generic code.

Patch

diff --git a/include/unistd.h b/include/unistd.h
index cb41637..9a77e89 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -158,7 +158,7 @@  rtld_hidden_proto (__libc_enable_secure)
 
 
 /* Various internal function.  */
-extern void __libc_check_standard_fds (void);
+extern void __libc_check_standard_fds (void) attribute_hidden;
 
 
 /* Internal name for fork function.  */
@@ -176,6 +176,24 @@  extern int __have_dup3 attribute_hidden;
 extern int __getlogin_r_loginuid (char *name, size_t namesize)
      attribute_hidden;
 
+#  if IS_IN (rtld)
+extern __typeof (__access) __access attribute_hidden;
+extern __typeof (__brk) __brk attribute_hidden;
+extern __typeof (__lseek) __lseek attribute_hidden;
+extern __typeof (__profil) __profil attribute_hidden;
+extern __typeof (__read) __read attribute_hidden;
+extern __typeof (__sbrk) __sbrk attribute_hidden;
+#   ifndef __gnu_hurd__
+/* On Hurd, these in ld.so will be preempted by the ones in libc.so after
+   bootstrap.  */
+extern __typeof (__close) __close attribute_hidden;
+extern __typeof (__getcwd) __getcwd attribute_hidden;
+extern __typeof (__getpid) __getpid attribute_hidden;
+extern __typeof (__libc_read) __libc_read attribute_hidden;
+extern __typeof (__libc_write) __libc_write attribute_hidden;
+#   endif
+#  endif
+
 __END_DECLS
 # endif