From patchwork Sat Mar 3 23:54:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 26178 Received: (qmail 107418 invoked by alias); 3 Mar 2018 23:54:59 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 107409 invoked by uid 89); 3 Mar 2018 23:54:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=H*r:sk:static-, Hx-spam-relays-external:sk:static-, H*RU:sk:static- X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [PATCH] hurd: Do not completely ignore Mach headers checks Date: Sun, 4 Mar 2018 00:54:50 +0100 Message-Id: <20180303235450.32607-1-samuel.thibault@ens-lyon.org> * scripts/check-installed-headers.sh: Do not ignore all Mach headers, only ignore non-gnu builds for mach/mig_support.h --- ChangeLog | 2 ++ scripts/check-installed-headers.sh | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bfa1bd316..cd6f45e96f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ * sysdeps/mach/i386/bits/mach/param.h: ... here. Update path in #error. * sysdeps/mach/hurd/bits/param.h: Include instead of . + * scripts/check-installed-headers.sh: Do not ignore all Mach headers, only + ignore non-gnu builds for mach/mig_support.h 2018-03-03 Andreas Schwab diff --git a/scripts/check-installed-headers.sh b/scripts/check-installed-headers.sh index f7f55917f7..9b433ed2ed 100644 --- a/scripts/check-installed-headers.sh +++ b/scripts/check-installed-headers.sh @@ -68,6 +68,7 @@ failed=0 is_x86_64=unknown is_x32=unknown for header in "$@"; do + gnu_only=0 # Skip various headers for which this test gets a false failure. case "$header" in # bits/* are not meant to be included directly and usually #error @@ -126,18 +127,24 @@ EOF fi ;; esac - ;; + ;; + + # Hurd headers are not standard anyway + (hurd.h | hurd/*.h | faultexc_server.h) + continue;; - # 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;; + # These require _GNU_SOURCE + (mach/mig_support.h) + gnu_only=1 + continue;; esac echo :: "$header" for lang_mode in "" $lang_modes; do for lib_mode in "" $lib_modes; do + if [ "$lib_mode" != "-D_GNU_SOURCE=1" -a "$gnu_only" = 1 ]; then + continue + fi echo :::: $lang_mode $lib_mode if [ -z "$lib_mode" ]; then expanded_lib_mode='/* default library mode */'