From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 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 dcvr.yhbt.net (Postfix) with ESMTPS id B5BD920248 for ; Fri, 1 Mar 2019 09:31:09 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-type; q=dns; s=default; b=kPfr y3TnIfgziYQd1kqYL/szrenKs1rKqSgMWqXdsK/iSAcyR8vyndN7UOfWZsKJNzpe dr1oagSXUI2DPuq+dPlosJHFZ0B9VL6lCn6W0azqFzvzG71UGvvXyP1dl0ryFQ5C Q5H5Cq2IefbPBATWQJoBBKMczrqGtO31UHEjc6M= 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:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-type; s=default; bh=NH8rHrBxLR cZb3U/Kzoc+4xIGcI=; b=LVhFdIBecFxk6AJTbUtpKxj7whLsTTKITgTK9BQHv2 8AgBGImHdt0INvvUXAWG7PoqccWqS9g3VDO1TI+9ExWrzqI7muyrao38F/Zo49Lm vsJOJTzvSGckIJuAp639q58CIZxsvmoE9ffTWehDqIdZ2XwkClrCS2+eLMeMAr4c Q= Received: (qmail 122087 invoked by alias); 1 Mar 2019 09:31:07 -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 Received: (qmail 122067 invoked by uid 89); 1 Mar 2019 09:31:06 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mx1.suse.de Subject: Re: [PATCH] Fix location where math-vector-fortran.h is installed. To: Florian Weimer , Zack Weinberg Cc: Joseph Myers , GNU C Library References: <863ffa3b-af66-7d82-21a8-e809fd6c1b62@suse.cz> <08214004-67b7-ce24-07ec-3cd685c65038@suse.cz> <84b2b212-a70a-e18a-5929-d89d6014fb70@suse.cz> <44cd0edb-2ab3-2908-8adb-f2e06859ecfe@suse.cz> <57bb8e48-8805-91ca-9902-9c6fbc3d5360@suse.cz> <87imx62qtr.fsf@oldenburg2.str.redhat.com> <974399a2-cf1a-1b23-bb9d-b97772278335@suse.cz> <874l8oqbrb.fsf@oldenburg2.str.redhat.com> From: =?UTF-8?Q?Martin_Li=c5=a1ka?= Message-ID: <899e2237-81cf-ec5b-33f9-662f5a4ede4d@suse.cz> Date: Fri, 1 Mar 2019 10:31:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <874l8oqbrb.fsf@oldenburg2.str.redhat.com> Content-Type: multipart/mixed; boundary="------------2ACCEDB06C152D461BCC0A3F" This is a multi-part message in MIME format. --------------2ACCEDB06C152D461BCC0A3F Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 2/28/19 2:32 PM, Florian Weimer wrote: > * Zack Weinberg: > >> Revised patch looks good to me except: >> >>> -! Platform-specific declarations of SIMD math functions for Fortran. -*- f90 -*- >>> +! Platform-specific declarations of SIMD math functions for Fortran. >> >> Let's keep the -*- f90 -*- annotations, they will also be helpful for >> future people editing these files. For instance, on my computer, both >> emacs and vim use the Fortran syntax highlighting rules for these >> files when the annotation is present, and the C rules when it's >> absent. >> >>> + # Skip Fortran header files >>> + if 'finclude' in header: >>> + continue >> >> I think this conditional should be >> >> if header.startswith('finclude/') or '/finclude/' in header >> >> so that it only applies to headers in the directory 'finclude', not >> any hypothetical future headers that happen to have the string >> 'finclude' in their base names. (I don't know why that would happen, >> but if it ever did, I can see someone being really confused why it >> wasn't getting tested, so some extra defensiveness now seems like a >> good idea.) > > I agree. Maybe also add a period to the end of the comment. 8-) > > Thanks, > Florian > Thank you both for help, I've updated the patch. Martin --------------2ACCEDB06C152D461BCC0A3F Content-Type: text/x-patch; name="0001-Fix-location-where-math-vector-fortran.h-is-installe.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Fix-location-where-math-vector-fortran.h-is-installe.pa"; filename*1="tch" >From 74b9d0deddbcb0f6433be937f6b1d7f632e257d6 Mon Sep 17 00:00:00 2001 From: marxin Date: Tue, 26 Feb 2019 18:17:36 +0100 Subject: [PATCH] Fix location where math-vector-fortran.h is installed. ChangeLog: 2019-02-26 Martin Liska * math/Makefile: Change location where math-vector-fortran.h is installed. * math/finclude/math-vector-fortran.h: Move from bits/math-vector-fortran.h. * sysdeps/x86/fpu/finclude/math-vector-fortran.h: Move from sysdeps/x86/fpu/bits/math-vector-fortran.h. * scripts/check-installed-headers.sh: Skip Fortran header files. * scripts/check-wrapper-headers.py: Likewise. --- math/Makefile | 2 +- {bits => math/finclude}/math-vector-fortran.h | 0 scripts/check-installed-headers.sh | 4 ++++ scripts/check-wrapper-headers.py | 4 ++++ sysdeps/x86/fpu/{bits => finclude}/math-vector-fortran.h | 0 5 files changed, 9 insertions(+), 1 deletion(-) rename {bits => math/finclude}/math-vector-fortran.h (100%) rename sysdeps/x86/fpu/{bits => finclude}/math-vector-fortran.h (100%) diff --git a/math/Makefile b/math/Makefile index fc4191089d..cb4eaec6a9 100644 --- a/math/Makefile +++ b/math/Makefile @@ -26,7 +26,7 @@ headers := math.h bits/mathcalls.h bits/mathinline.h \ fpu_control.h complex.h bits/cmathcalls.h fenv.h \ bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \ bits/math-finite.h bits/math-vector.h \ - bits/math-vector-fortran.h \ + finclude/math-vector-fortran.h \ bits/libm-simd-decl-stubs.h bits/iscanonical.h \ bits/flt-eval-method.h bits/fp-fast.h bits/fp-logb.h \ bits/long-double.h bits/mathcalls-helper-functions.h \ diff --git a/bits/math-vector-fortran.h b/math/finclude/math-vector-fortran.h similarity index 100% rename from bits/math-vector-fortran.h rename to math/finclude/math-vector-fortran.h diff --git a/scripts/check-installed-headers.sh b/scripts/check-installed-headers.sh index 8e7beffd82..1f4496446c 100644 --- a/scripts/check-installed-headers.sh +++ b/scripts/check-installed-headers.sh @@ -84,6 +84,10 @@ for header in "$@"; do (sys/elf.h) continue;; + # Skip Fortran headers. + (finclude/*) + continue;; + # sys/sysctl.h is unsupported for x32. (sys/sysctl.h) case "$is_x32" in diff --git a/scripts/check-wrapper-headers.py b/scripts/check-wrapper-headers.py index 094faa3ced..dc9fd86063 100644 --- a/scripts/check-wrapper-headers.py +++ b/scripts/check-wrapper-headers.py @@ -75,6 +75,10 @@ def check_headers(args): is_nonsysdep_header = os.access(header, os.R_OK) if is_nonsysdep_header: + # Skip Fortran header files. + if '/finclude/' in header: + continue + include_path = os.path.join(args.root, INCLUDE, header) if not os.access(include_path, os.R_OK): print('error: missing wrapper header {} for {}'.format( diff --git a/sysdeps/x86/fpu/bits/math-vector-fortran.h b/sysdeps/x86/fpu/finclude/math-vector-fortran.h similarity index 100% rename from sysdeps/x86/fpu/bits/math-vector-fortran.h rename to sysdeps/x86/fpu/finclude/math-vector-fortran.h -- 2.20.1 --------------2ACCEDB06C152D461BCC0A3F--