From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 34645 invoked by alias); 7 Nov 2016 23:30:55 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 34453 invoked by uid 89); 7 Nov 2016 23:30:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_SORBS_SPAM,SPF_PASS,URIBL_RED autolearn=ham version=3.3.2 spammy=eof, EOF, Hx-languages-length:1616 X-HELO: mail-qk0-f173.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=zhcIA4dJmzoMA0hymDU7LStdLcau4U/RAeBLC+uptHc=; b=ewRxQT+4btr963IRR84rjwaC61oFG1eDGC9hmkykaUC/iVjEq8p5GpNSMopmaePzhQ 44SjlGbRfu8fuKmRmsMdL4pzpq6hgG0FKT4RbJ+plWlbLXG9P1TWAhlqnTE4fa9HOKls mNdHmdCAEg64X+ejOAcX4SzO5v0oPC07MIt/7+okhXYDgETWJitFMEhlBIMhQOl9NNgW NYZXqEiOfJM6RdlaJSBacDAN3BMftuTquUCQwM6QQkMmr3nY8gDwTgWpaNx94u1qlt4n VdRWxd5up7QEJ3PY9PAHrY5fMIhjR3xy0/O0I7tuK6TzVfryXcMz0XISSlVePfy2xUAV LysQ== X-Gm-Message-State: ABUngvdN+ddnu8AT0dThFjykHs9XPZ4DJL+NB7qG8bGJsfaM96ZuN4tSRtnYBbLsz0fZkI68g1Rlq78xVMVLAw== X-Received: by 10.55.169.87 with SMTP id s84mr9135904qke.216.1478561442363; Mon, 07 Nov 2016 15:30:42 -0800 (PST) MIME-Version: 1.0 In-Reply-To: References: From: "H.J. Lu" Date: Mon, 07 Nov 2016 23:30:00 -0000 Message-ID: Subject: Re: Make check-installed-headers.sh ignore sys/sysctl.h for x32 To: Joseph Myers Cc: GNU C Library Content-Type: text/plain; charset=UTF-8 X-SW-Source: 2016-11/txt/msg00259.txt.bz2 On Thu, Nov 3, 2016 at 3:48 PM, Joseph Myers wrote: > 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" < +#if defined __x86_64__ && defined __ILP32__ > +# error "is x32" > +#endif > +EOF > + if $cc_cmd -fsyntax-only "$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 > It looks good to me. Thanks. -- H.J.