hurd: keep only required PLTs in ld.so

We need NO_RTLD_HIDDEN because of the need for PLT calls in ld.so.
See Roland's comment in
https://sourceware.org/bugzilla/show_bug.cgi?id=15605
"in the Hurd it's crucial that calls like __mmap be the libc ones
instead of the rtld-local ones after the bootstrap phase, when the
dynamic linker is being used for dlopen and the like."

We used to just avoid all hidden use in the rtld ; this commit switches to
keeping only those that should use PLT calls, i.e. essentially those defined in
sysdeps/mach/hurd/dl-sysdep.c:

__assert_fail
__assert_perror_fail
__*stat64
_exit

This fixes a few startup issues, notably the call to __tunable_get_val that is
made before PLTs are set up.

9 files changed, 10 insertions, 8 deletions

diff --git a/include/dirent.h b/include/dirent.h
index 8325a19..f1d7e83 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -81,7 +81,7 @@ extern int __scandir64_tail (DIR *dp,
 libc_hidden_proto (__rewinddir)
 extern __typeof (scandirat) __scandirat;
 
-#  if IS_IN (rtld) && !defined NO_RTLD_HIDDEN
+#  if IS_IN (rtld)
 extern __typeof (__rewinddir) __rewinddir attribute_hidden;
 #  endif
 # endif
diff --git a/include/libc-internal.h b/include/libc-internal.h
index 729db79..915613c 100644
--- a/include/libc-internal.h
+++ b/include/libc-internal.h
@@ -43,7 +43,7 @@ extern void __libc_thread_freeres (void);
 /* Define and initialize `__progname' et. al.  */
 extern void __init_misc (int, char **, char **) attribute_hidden;
 
-# if IS_IN (rtld) && !defined NO_RTLD_HIDDEN
+# if IS_IN (rtld)
 extern __typeof (__profile_frequency) __profile_frequency attribute_hidden;
 # endif
 
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 60153bb..b8103b9 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -643,7 +643,7 @@ for linking")
 # define libc_hidden_data_ver(local, name)
 #endif
 
-#if IS_IN (rtld) && !defined NO_RTLD_HIDDEN
+#if IS_IN (rtld)
 # define rtld_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
 # define rtld_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs)
 # define rtld_hidden_def(name) hidden_def (name)
diff --git a/include/setjmp.h b/include/setjmp.h
index e13017e..0a8e4d2 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -27,7 +27,7 @@ extern void __libc_longjmp (sigjmp_buf env, int val)
 libc_hidden_proto (_setjmp)
 libc_hidden_proto (__sigsetjmp)
 
-# if IS_IN (rtld) && !defined NO_RTLD_HIDDEN
+# if IS_IN (rtld)
 extern __typeof (__sigsetjmp) __sigsetjmp attribute_hidden;
 # endif
 
diff --git a/include/signal.h b/include/signal.h
index 544d701..2a27869 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -67,7 +67,7 @@ extern int __xpg_sigpause (int sig);
 /* Allocate real-time signal with highest/lowest available priority.  */
 extern int __libc_allocate_rtsig (int __high);
 
-#  if IS_IN (rtld) && !defined NO_RTLD_HIDDEN
+#  if IS_IN (rtld)
 extern __typeof (__sigaction) __sigaction attribute_hidden;
 extern __typeof (__libc_sigaction) __libc_sigaction attribute_hidden;
 #  endif
diff --git a/include/stdlib.h b/include/stdlib.h
index ffcefd7..cdbdbf3 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -310,7 +310,7 @@ struct abort_msg_s
 extern struct abort_msg_s *__abort_msg;
 libc_hidden_proto (__abort_msg)
 
-# if IS_IN (rtld) && !defined NO_RTLD_HIDDEN
+# if IS_IN (rtld)
 extern __typeof (unsetenv) unsetenv attribute_hidden;
 extern __typeof (__strtoul_internal) __strtoul_internal attribute_hidden;
 # endif
diff --git a/include/string.h b/include/string.h
index f4ce138..7d344d7 100644
--- a/include/string.h
+++ b/include/string.h
@@ -150,7 +150,7 @@ libc_hidden_builtin_proto (strspn)
 libc_hidden_builtin_proto (strstr)
 libc_hidden_builtin_proto (ffs)
 
-#if IS_IN (rtld) && !defined NO_RTLD_HIDDEN
+#if IS_IN (rtld)
 extern __typeof (__stpcpy) __stpcpy attribute_hidden;
 extern __typeof (__strdup) __strdup attribute_hidden;
 extern __typeof (__strerror_r) __strerror_r attribute_hidden;
diff --git a/include/sys/utsname.h b/include/sys/utsname.h
index 9ed5fa2..14f4247 100644
--- a/include/sys/utsname.h
+++ b/include/sys/utsname.h
@@ -7,7 +7,7 @@ extern int __uname (struct utsname *__name);
 libc_hidden_proto (uname)
 libc_hidden_proto (__uname)
 
-# if IS_IN (rtld) && !defined NO_RTLD_HIDDEN
+# if IS_IN (rtld)
 extern __typeof (__uname) __uname attribute_hidden;
 # endif
 #endif
diff --git a/include/unistd.h b/include/unistd.h
index f48da2c..54becbc 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -4,7 +4,9 @@
 # ifndef _ISOMAC
 
 libc_hidden_proto (_exit, __noreturn__)
+#  ifndef NO_RTLD_HIDDEN
 rtld_hidden_proto (_exit, __noreturn__)
+#  endif
 libc_hidden_proto (alarm)
 extern size_t __confstr (int name, char *buf, size_t len);
 libc_hidden_proto (__confstr)