From patchwork Thu Nov 3 22:48:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 691066 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t90Wg5drnz9vF1 for ; Fri, 4 Nov 2016 09:49:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=v3/XIoAX; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=AMxaNQ4gMSY4fewVzrHswoBIvKK1d kiNvAOWoo6CRtfUsJlWPXOJRw0XmHXl6w5rdHkHWwauM3pv5dwh3w0s0IKKjO0iY 7CcrB/LPszOEptvYGgui+EdURhgINGqe+EvmfW1ArTLgTqljcS9foZIX5j7OtD8a 0SCsC9+vg7Qht8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=z23L8gfXDaJrsnH2F69jG4thVs4=; b=v3/ XIoAX4YwAxTVYVBrZWuGoADNAoxtLaFw8IGkn5DSjRPM6IzXfkv/nXVWSfc3xcgg ibXOJBjZjbuASYMqLQnN8NcnUEPxZGJKp/BdIRF0H6BIZm7eWrHYnuoQ6bNVGFNa lxJsy2xpLRrIP2e3GTpls5LrYVJM3dsjKuTH+UN0= Received: (qmail 116877 invoked by alias); 3 Nov 2016 22:48:56 -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 116862 invoked by uid 89); 3 Nov 2016 22:48:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=compileonly, 8428, compile-only X-HELO: relay1.mentorg.com Date: Thu, 3 Nov 2016 22:48:37 +0000 From: Joseph Myers To: Subject: Make check-installed-headers.sh ignore sys/sysctl.h for x32 Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) check-installed-headers tests were failing for x32 because of the x86 bits/sysctl.h containing a #error for x32. This patch makes the tests ignore sys/sysctl.h for x32, similar to the other special-casing of particular headers. Tested for x86_64 (full testing for -m64, compile-only for x32). 2016-11-03 Joseph Myers * scripts/check-installed-headers.sh: Ignore sys/sysctl.h for x32. diff --git a/scripts/check-installed-headers.sh b/scripts/check-installed-headers.sh index 87d6142..a245fe6 100644 --- a/scripts/check-installed-headers.sh +++ b/scripts/check-installed-headers.sh @@ -66,6 +66,7 @@ trap "rm -f '$cih_test_c'" 0 failed=0 is_x86_64=unknown +is_x32=unknown for header in "$@"; do # Skip various headers for which this test gets a false failure. case "$header" in @@ -83,6 +84,28 @@ for header in "$@"; do (sys/elf.h) continue;; + # sys/sysctl.h is unsupported for x32. + (sys/sysctl.h) + case "$is_x32" in + (yes) continue;; + (no) ;; + (unknown) + cat >"$cih_test_c" < /dev/null 2>&1 + then + is_x32=no + else + is_x32=yes + continue + fi + ;; + esac + ;; + # sys/vm86.h is "unsupported on x86-64" and errors out on that target. (sys/vm86.h) case "$is_x86_64" in