summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-07-20 03:00:09 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-07-20 03:28:08 +0200
commit8ba1520e8c72ad0e2a33235625b37002c2715706 (patch)
tree5c594b419d967e02241d68e34889cacb5b11333c
parent38547460b7173f999c4e9f9bff8b1eccb0039dc6 (diff)
downloadglibc-8ba1520e8c72ad0e2a33235625b37002c2715706.tar.gz
hurd: Fix installed-headers tests
* sysdeps/mach/include/mach-shortcuts-hidden.h [!_ISOMAC]: Do not declare libc hidden prototypes. * sysdeps/mach/include/mach/mach_traps.h [!_ISOMAC]: Likewise.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/hurd/include/hurd/port.h2
-rw-r--r--sysdeps/mach/include/mach-shortcuts-hidden.h2
-rw-r--r--sysdeps/mach/include/mach/mach_traps.h2
4 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 93cc5f4e0a..ace34c0a81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
* sysdeps/mach/hurd/i386/tls.h (_hurd_tls_init): Set multiple_threads
to 1.
+ * sysdeps/hurd/include/hurd/port.h [!_ISOMAC]: Do not declare libc
+ hidden prototypes.
+ * sysdeps/mach/include/mach-shortcuts-hidden.h [!_ISOMAC]: Likewise.
+ * sysdeps/mach/include/mach/mach_traps.h [!_ISOMAC]: Likewise.
2018-07-20 Thomas Schwinge <tschwinge@gnu.org>
diff --git a/sysdeps/hurd/include/hurd/port.h b/sysdeps/hurd/include/hurd/port.h
index 84582f6d02..ca1d2d111a 100644
--- a/sysdeps/hurd/include/hurd/port.h
+++ b/sysdeps/hurd/include/hurd/port.h
@@ -1,5 +1,6 @@
#ifndef _HURD_PORT_H
#include_next <hurd/port.h>
+#ifndef _ISOMAC
libc_hidden_proto (_hurd_port_locked_get)
libc_hidden_proto (_hurd_port_locked_set)
#ifdef _HURD_PORT_H_HIDDEN_DEF
@@ -7,3 +8,4 @@ libc_hidden_def (_hurd_port_locked_get)
libc_hidden_def (_hurd_port_locked_set)
#endif
#endif
+#endif
diff --git a/sysdeps/mach/include/mach-shortcuts-hidden.h b/sysdeps/mach/include/mach-shortcuts-hidden.h
index 0942871f26..f0ab8804ca 100644
--- a/sysdeps/mach/include/mach-shortcuts-hidden.h
+++ b/sysdeps/mach/include/mach-shortcuts-hidden.h
@@ -1,4 +1,5 @@
#include <mach-shortcuts.h>
+#ifndef _ISOMAC
libc_hidden_proto (__task_create)
libc_hidden_proto (__task_terminate)
libc_hidden_proto (__vm_allocate)
@@ -11,3 +12,4 @@ libc_hidden_proto (__mach_port_allocate_name)
libc_hidden_proto (__mach_port_allocate)
libc_hidden_proto (__mach_port_deallocate)
libc_hidden_proto (__mach_port_insert_right)
+#endif
diff --git a/sysdeps/mach/include/mach/mach_traps.h b/sysdeps/mach/include/mach/mach_traps.h
index 2d4c1f9c5f..c43349524d 100644
--- a/sysdeps/mach/include/mach/mach_traps.h
+++ b/sysdeps/mach/include/mach/mach_traps.h
@@ -1,6 +1,7 @@
#ifndef _MACH_MACH_TRAPS_H
#include_next <mach/mach_traps.h>
+#ifndef _ISOMAC
extern mach_port_t __mach_reply_port (void);
libc_hidden_proto (__mach_reply_port)
extern mach_port_t __mach_thread_self (void);
@@ -19,3 +20,4 @@ libc_hidden_proto (__thread_switch)
kern_return_t __evc_wait (unsigned int event);
libc_hidden_proto (__evc_wait)
#endif
+#endif