From a726c87a149869b51f1c050014d320ff15df81bb Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 4 Mar 2018 02:49:44 +0100
Subject: [PATCH] hurd: Fix inclusion of mach headers in all standards

mig_support does not actually inline the stpncpy any more.

	* mach/mach/mig_support.h [defined __USE_GNU]: Do not #error out.
	* scripts/check-installed-headers.sh: Do not ignore Hurd and Mach
	headers.
---
 ChangeLog                          |  3 +++
 mach/mach/mig_support.h            | 13 -------------
 scripts/check-installed-headers.sh |  8 +-------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 819a8db2cd..33d3008a91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
 	* mach/Machrules ($(patsubst %,$(objpfx)%.h,$(user-interfaces)):
 	Process mig output through $(migheadersed).
 	* hurd/Makefile (migheadersed): Define variable.
+	* mach/mach/mig_support.h [defined __USE_GNU]: Do not #error out.
+	* scripts/check-installed-headers.sh: Do not ignore Hurd and Mach
+	headers.
 
 2018-03-03  Andreas Schwab  <schwab@linux-m68k.org>
 
diff --git a/mach/mach/mig_support.h b/mach/mach/mig_support.h
index 56ec6dfab8..fc17062b6a 100644
--- a/mach/mach/mig_support.h
+++ b/mach/mach/mig_support.h
@@ -26,19 +26,6 @@
 #include <sys/types.h>
 #include <string.h>
 
-#ifndef __USE_GNU
-/* The only problem that has come up so far is __stpncpy being undeclared
-   below because <string.h> doesn't declare it without __USE_GNU.  We could
-   work around that problem by just adding the declaration there, or by
-   eliding the inline functions in the absence of __USE_GNU.  But either of
-   these would result in unoptimized calls (because no inline version of
-   __stpncpy will have been defined), and there may be other niggling
-   problems lurking.  Instead we simply insist on _GNU_SOURCE for
-   compiling mig output; anyway, that better reflects the fact that mig
-   output requires nonstandard special support code not found elsewhere.  */
-# error mig stubs must be compiled with -D_GNU_SOURCE
-#endif
-
 /* MiG initialization.  */
 extern void __mig_init (void *__first);
 extern void mig_init (void *__first);
diff --git a/scripts/check-installed-headers.sh b/scripts/check-installed-headers.sh
index f7f55917f7..4a062e9cda 100644
--- a/scripts/check-installed-headers.sh
+++ b/scripts/check-installed-headers.sh
@@ -126,13 +126,7 @@ EOF
                     fi
                 ;;
             esac
-	    ;;
-
-	# Hurd and Mach headers are not standard anyway
-	(hurd.h | hurd/*.h | faultexc_server.h | \
-	 mach.h | mach_init.h | mach_error.h | mach-shortcuts.h | mach/* | \
-	 device/* | lock-intern.h | spin-lock.h | machine-sp.h)
-	    continue;;
+            ;;
     esac
 
     echo :: "$header"