From c1b7586c544957998c0f53711fa91e5de72cc819 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 16 Jun 2018 02:19:47 +0200
Subject: [PATCH] hurd: Avoid PLT references to shortcuts

	* sysdeps/mach/include/mach-shortcuts-hidden.h: New file.
	* mach/shortcut.awk: Make syscall stubs include
	<mach-shortcuts-hidden.h> and add hidden definition.
	* sysdeps/mach/include/mach.h: Include <mach-shortcuts-hidden.h>.
---
 ChangeLog                                    |  4 ++++
 mach/shortcut.awk                            |  2 ++
 sysdeps/mach/include/mach-shortcuts-hidden.h | 13 +++++++++++++
 sysdeps/mach/include/mach.h                  |  1 +
 4 files changed, 20 insertions(+)
 create mode 100644 sysdeps/mach/include/mach-shortcuts-hidden.h

diff --git a/ChangeLog b/ChangeLog
index 7ceaa829a8..4defdb6462 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
 	* sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Remove
 	prototype.
 	* sysdeps/mach/hurd/localplt.data (ld.so): Make ref to __open optional.
+	* sysdeps/mach/include/mach-shortcuts-hidden.h: New file.
+	* mach/shortcut.awk: Make syscall stubs include
+	<mach-shortcuts-hidden.h> and add hidden definition.
+	* sysdeps/mach/include/mach.h: Include <mach-shortcuts-hidden.h>.
 
 2018-06-15  Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/mach/shortcut.awk b/mach/shortcut.awk
index ea283d49ba..090da82b6a 100644
--- a/mach/shortcut.awk
+++ b/mach/shortcut.awk
@@ -1,6 +1,7 @@
 # Icky intimate knowledge of MiG output.
 
 BEGIN { print "/* This file is generated by shortcut.awk.  */";
+	print "#include <mach-shortcuts-hidden.h>";
 	echo=1;
 	inproto=0; proto=""; arglist="";
       }
@@ -44,6 +45,7 @@ echo == 1 { print $0; }
     print "  return err;"
     print "}";
     print "weak_alias (" call ", " alias ")";
+    print "libc_hidden_def (" call ")";
     # Declare RPC so the weak_alias that follows will work.
     print "extern __typeof (" call ") " rpc ";";
     echo = 1;
diff --git a/sysdeps/mach/include/mach-shortcuts-hidden.h b/sysdeps/mach/include/mach-shortcuts-hidden.h
new file mode 100644
index 0000000000..0942871f26
--- /dev/null
+++ b/sysdeps/mach/include/mach-shortcuts-hidden.h
@@ -0,0 +1,13 @@
+#include <mach-shortcuts.h>
+libc_hidden_proto (__task_create)
+libc_hidden_proto (__task_terminate)
+libc_hidden_proto (__vm_allocate)
+libc_hidden_proto (__vm_deallocate)
+libc_hidden_proto (__task_suspend)
+libc_hidden_proto (__task_set_special_port)
+libc_hidden_proto (__vm_map)
+libc_hidden_proto (__thread_depress_abort)
+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)
diff --git a/sysdeps/mach/include/mach.h b/sysdeps/mach/include/mach.h
index b4c2f45240..fff8349b82 100644
--- a/sysdeps/mach/include/mach.h
+++ b/sysdeps/mach/include/mach.h
@@ -1,5 +1,6 @@
 #ifndef	_MACH_H
 #include_next <mach.h>
+#include <mach-shortcuts-hidden.h>
 #ifndef _ISOMAC
 libc_hidden_proto (__mach_msg_destroy)
 #endif