From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 24 Apr 2018 16:33:47 +0000 (+0000)
Subject: Fix Hurd glibc build with GCC 8.
X-Git-Tag: glibc-2.28~319
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e14bb97937dda422effcf2750b40e342e83ccc8;p=thirdparty%2Fglibc.git

Fix Hurd glibc build with GCC 8.

The build of glibc for Hurd has been failing with GCC mainline because
of the checks that aliases have the same type as the symbol aliased;
the Hurd dl-sysdep.c has a macro that defines aliases without using
the proper type.  When GCC 8 branches (soon), I intend to make it the
default version in build-many-glibcs.py, so these failures would mean
the default build-many-glibcs.py build fails for Hurd again.

This patch fixes the Hurd build with GCC 8 by changing the macro that
defines the problem aliases to use the correct type for them.  An
include of <not-errno.h> is needed to avoid this use of typeof
resulting in an error for __access_noerrno not being declared.

Tested compilation for i686-gnu with build-many-glibcs.py.

	* sysdeps/mach/hurd/dl-sysdep.c: Include <not-errno.h>.
	(check_no_hidden): Use type of original function when declaring
	alias.
---

diff --git a/ChangeLog b/ChangeLog
index 67c129b47d9..efa8d39391d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2018-04-24  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/mach/hurd/dl-sysdep.c: Include <not-errno.h>.
+	(check_no_hidden): Use type of original function when declaring
+	alias.
+
 	* sysdeps/unix/sysv/linux/sys/ptrace.h
 	(PTRACE_SECCOMP_GET_METADATA): New enum value and macro.
 	* sysdeps/unix/sysv/linux/bits/ptrace-shared.h
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index cbf4e058629..547108805e5 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -46,6 +46,7 @@
 #include <dl-procinfo.h>
 
 #include <dl-tunables.h>
+#include <not-errno.h>
 
 extern void __mach_init (void);
 
@@ -278,8 +279,9 @@ _dl_sysdep_start_cleanup (void)
 
 /* This macro checks that the function does not get renamed to be hidden: we do
    need these to be overridable by libc's.  */
-#define check_no_hidden(name) \
-static void __check_##name##_no_hidden(void) __attribute__((alias(#name)));
+#define check_no_hidden(name)				\
+  static __typeof (name) __check_##name##_no_hidden	\
+       __attribute__ ((alias (#name)));
 
 /* Open FILE_NAME and return a Hurd I/O for it in *PORT, or return an
    error.  If STAT is non-zero, stat the file into that stat buffer.  */