From a166531fdf601560a0005479427f60d3173f8257 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 12 Sep 2017 01:34:19 +0200
Subject: hurd: Fix build without NO_HIDDEN

	* posix/sched_primax.c (__sched_get_priority_max): Add
	libc_hidden_def.
	* posix/sched_primin.c (__sched_get_priority_min): Likewise.
	* sysdeps/mach/hurd/mmap.c (__mmap): Likewise.
	* sysdeps/mach/hurd/mmap64.c (__mmap64): Likewise.
	* sysdeps/mach/hurd/mprotect.c (__mprotect): Likewise.
	* sysdeps/mach/hurd/munmap.c (__munmap): Likewise.
	* sysdeps/mach/hurd/dl-sysdep.c (__GI___getpid,
	__GI___strtoul_internal, __GI_____strtoul_internal, __GI___chk_fail,
	__GI___fortify_fail, __GI___assert_fail, __GI___assert_perror_fail):
	Add aliases.
---
 sysdeps/mach/hurd/dl-sysdep.c | 13 +++++++++++++
 sysdeps/mach/hurd/mmap.c      |  1 +
 sysdeps/mach/hurd/mmap64.c    |  1 +
 sysdeps/mach/mprotect.c       |  1 +
 sysdeps/mach/munmap.c         |  1 +
 5 files changed, 17 insertions(+)

(limited to 'sysdeps/mach')

diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 517e4d62cc..8a8ac76efa 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -577,6 +577,10 @@ __getpid (void)
   return pid;
 }
 
+/* We need this alias to satisfy references from libc_pic.a objects
+   that were affected by the libc_hidden_proto declaration for __getpid.  */
+strong_alias (__getpid, __GI___getpid)
+
 /* This is called only in some strange cases trying to guess a value
    for $ORIGIN for the executable.  The dynamic linker copes with
    getcwd failing (dl-object.c), and it's too much hassle to include
@@ -611,6 +615,11 @@ __strtoul_internal (const char *nptr, char **endptr, int base, int group)
   return _dl_strtoul (nptr, endptr);
 }
 
+/* We need this alias to satisfy references from libc_pic.a objects
+   that were affected by the libc_hidden_proto declaration for __strtoul_internal.  */
+strong_alias (__strtoul_internal, __GI___strtoul_internal)
+strong_alias (__strtoul_internal, __GI_____strtoul_internal)
+
 void weak_function attribute_hidden
 _exit (int status)
 {
@@ -649,6 +658,10 @@ abort (void)
 /* We need this alias to satisfy references from libc_pic.a objects
    that were affected by the libc_hidden_proto declaration for abort.  */
 strong_alias (abort, __GI_abort)
+strong_alias (abort, __GI___chk_fail)
+strong_alias (abort, __GI___fortify_fail)
+strong_alias (abort, __GI___assert_fail)
+strong_alias (abort, __GI___assert_perror_fail)
 
 /* This function is called by interruptible RPC stubs.  For initial
    dynamic linking, just use the normal mach_msg.  Since this defn is
diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c
index 72706c3332..a6b4e8bf9e 100644
--- a/sysdeps/mach/hurd/mmap.c
+++ b/sysdeps/mach/hurd/mmap.c
@@ -185,4 +185,5 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
   return (void *) mapaddr;
 }
 
+libc_hidden_def (__mmap)
 weak_alias (__mmap, mmap)
diff --git a/sysdeps/mach/hurd/mmap64.c b/sysdeps/mach/hurd/mmap64.c
index 282b7525c8..1547e856b7 100644
--- a/sysdeps/mach/hurd/mmap64.c
+++ b/sysdeps/mach/hurd/mmap64.c
@@ -44,4 +44,5 @@ __mmap64 (void *addr, size_t len, int prot, int flags, int fd,
   return __mmap (addr, len, prot, flags, fd, small_offset);
 }
 
+libc_hidden_def (__mmap64)
 weak_alias (__mmap64, mmap64)
diff --git a/sysdeps/mach/mprotect.c b/sysdeps/mach/mprotect.c
index 84a72850ac..680905703d 100644
--- a/sysdeps/mach/mprotect.c
+++ b/sysdeps/mach/mprotect.c
@@ -47,4 +47,5 @@ __mprotect (void *addr, size_t len, int prot)
     }
   return 0;
 }
+libc_hidden_def (__mprotect)
 weak_alias (__mprotect, mprotect)
diff --git a/sysdeps/mach/munmap.c b/sysdeps/mach/munmap.c
index 4a98613baf..5ba414ba05 100644
--- a/sysdeps/mach/munmap.c
+++ b/sysdeps/mach/munmap.c
@@ -43,4 +43,5 @@ __munmap (void *addr, size_t len)
   return 0;
 }
 
+libc_hidden_def (__munmap)
 weak_alias (__munmap, munmap)
-- 
cgit 1.4.1