From: "Martin Liška" <mliska@suse.cz>
To: Florian Weimer <fweimer@redhat.com>
Cc: Zack Weinberg <zackw@panix.com>,
Joseph Myers <joseph@codesourcery.com>,
GNU C Library <libc-alpha@sourceware.org>
Subject: Re: [PATCH] Fix location where math-vector-fortran.h is installed.
Date: Wed, 27 Feb 2019 11:36:34 +0100 [thread overview]
Message-ID: <1c3a168a-b142-d6e5-55d6-f82850610cc8@suse.cz> (raw)
In-Reply-To: <87o96xv8u2.fsf@oldenburg2.str.redhat.com>
[-- Attachment #1: Type: text/plain, Size: 643 bytes --]
On 2/27/19 11:12 AM, Florian Weimer wrote:
> * Martin Liška:
>
>> is_nonsysdep_header = os.access(header, os.R_OK)
>> if is_nonsysdep_header:
>> + # Skip Fortran header files
>> + if '-*- f90 -*-' in open(header).readlines()[0]:
>> + continue
>
> Please use “with” to close the file promptly, and do not read the entire
> file, like this (untested):
>
> # Skip Fortran header files.
> with open(header) as inp:
> if '-*- f90 -*-' in next(inp):
> continue
Good point. Is the patch ready to be installed now?
Thanks,
Martin
>
> Thanks,
> Florian
>
[-- Attachment #2: 0001-Fix-location-where-math-vector-fortran.h-is-installe.patch --]
[-- Type: text/x-patch, Size: 3373 bytes --]
From 5e786337c48dbf33453a634725e2e95b10c73b62 Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
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 <mliska@suse.cz>
* math/Makefile: Change location where math-vector-fortran.h is
installed.
* 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 file.
* scripts/check-wrapper-headers.py: Filter out f90 files.
---
math/Makefile | 2 +-
{bits => math/finclude}/math-vector-fortran.h | 0
| 4 ++++
| 5 +++++
sysdeps/x86/fpu/{bits => finclude}/math-vector-fortran.h | 0
5 files changed, 10 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 \
--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..937ed969ec 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 header
+ (finclude/math-vector-fortran.h)
+ continue;;
+
# sys/sysctl.h is unsupported for x32.
(sys/sysctl.h)
case "$is_x32" in
--git a/scripts/check-wrapper-headers.py b/scripts/check-wrapper-headers.py
index 094faa3ced..6d9a89bc98 100644
--- a/scripts/check-wrapper-headers.py
+++ b/scripts/check-wrapper-headers.py
@@ -75,6 +75,11 @@ def check_headers(args):
is_nonsysdep_header = os.access(header, os.R_OK)
if is_nonsysdep_header:
+ # Skip Fortran header files
+ with open(header) as inp:
+ if '-*- f90 -*-' in next(inp):
+ 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
next prev parent reply other threads:[~2019-02-27 10:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-18 14:31 [PATCH] Add new Fortran vector math header file Martin Liška
2019-02-18 17:55 ` Joseph Myers
2019-02-19 9:18 ` Martin Liška
2019-02-19 17:59 ` Joseph Myers
2019-02-19 19:14 ` Zack Weinberg
2019-02-20 9:43 ` Martin Liška
2019-02-20 13:05 ` Zack Weinberg
2019-02-20 13:52 ` Martin Liška
2019-02-26 17:56 ` [PATCH] Fix location where math-vector-fortran.h is installed Martin Liška
2019-02-26 18:05 ` Joseph Myers
2019-02-26 18:30 ` Martin Liška
2019-02-26 21:16 ` Florian Weimer
2019-02-26 21:41 ` Zack Weinberg
2019-02-27 8:09 ` Martin Liška
2019-02-27 10:12 ` Florian Weimer
2019-02-27 10:36 ` Martin Liška [this message]
2019-02-27 11:30 ` Andreas Schwab
2019-02-27 11:53 ` Martin Liška
2019-02-27 15:00 ` Zack Weinberg
2019-02-28 13:18 ` Martin Liška
2019-02-28 13:30 ` Zack Weinberg
2019-02-28 13:32 ` Florian Weimer
2019-03-01 9:31 ` Martin Liška
2019-03-01 22:30 ` Steve Ellcey
2019-03-05 12:03 ` Martin Liška
2019-03-06 21:13 ` Joseph Myers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1c3a168a-b142-d6e5-55d6-f82850610cc8@suse.cz \
--to=mliska@suse.cz \
--cc=fweimer@redhat.com \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
--cc=zackw@panix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).