Re: [PATCH 3/3] Mark internel unistd functions hidden

["H.J. Lu" <hjl dot tools at gmail dot com>]

On Mon, Oct 19, 2015 at 11:31 AM, Roland McGrath <roland@hack.frob.com> wrote:
> NAK to #ifdef in generic code.

Here is the updated patch with a new header file,
dl-unistd.h.  OK for master?


-- 
H.J.

From d6e63bad69929e8965a82f2270b5952249f9bb4d Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 14 Oct 2015 15:21:55 -0700
Subject: [PATCH 2/2] Mark internel unistd functions hidden

Since internal unistd functions are only used internally in ld.so and
libc.so, they can be made hidden.  Some functions can't be hidden in
ld.so on Hurd since they will be preempted by the ones in libc.so after
bootstrap.

	[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)]: Include <dl-unistd.h>.
	* sysdeps/generic/dl-unistd.h: New file.
	* sysdeps/mach/hurd/dl-unistd.h: Likewise.
---
 include/unistd.h              | 12 +++++++++++-
 sysdeps/generic/dl-unistd.h   | 22 ++++++++++++++++++++++
 sysdeps/mach/hurd/dl-unistd.h | 20 ++++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 sysdeps/generic/dl-unistd.h
 create mode 100644 sysdeps/mach/hurd/dl-unistd.h

diff --git a/include/unistd.h b/include/unistd.h
index cb41637..176745d 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,16 @@ extern int __have_dup3 attribute_hidden;
 extern int __getlogin_r_loginuid (char *name, size_t namesize)
      attribute_hidden;
 
+#  if IS_IN (rtld)
+#   include <dl-unistd.h>
+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;
+#  endif
+
 __END_DECLS
 # endif
 
diff --git a/sysdeps/generic/dl-unistd.h b/sysdeps/generic/dl-unistd.h
new file mode 100644
index 0000000..8877a85
--- /dev/null
+++ b/sysdeps/generic/dl-unistd.h
@@ -0,0 +1,22 @@
+/* Copyright (C) 2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+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;
diff --git a/sysdeps/mach/hurd/dl-unistd.h b/sysdeps/mach/hurd/dl-unistd.h
new file mode 100644
index 0000000..1a16a8b
--- /dev/null
+++ b/sysdeps/mach/hurd/dl-unistd.h
@@ -0,0 +1,20 @@
+/* Copyright (C) 2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+/* Can't hide functions in sysdeps/generic/dl-unistd.h on Hurd, since
+   those functions in ld.so will be preempted by the ones in libc.so
+   after bootstrap.  */
-- 
2.4.3