Fix location where math-vector-fortran.h is installed.
Commit Message
On 2/27/19 12:30 PM, Andreas Schwab wrote:
> On Feb 27 2019, Martin Liška <mliska@suse.cz> wrote:
>
>> 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.
>
> That file resides in math/.
>
> Andreas.
>
Sure.
Ready for trunk?
Thanks,
Martin
From bad39d298a37b3411ccc323ffe7a94d4891fe2f0 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.
* 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 file.
* scripts/check-wrapper-headers.py: Filter out f90 files.
---
math/Makefile | 2 +-
{bits => math/finclude}/math-vector-fortran.h | 0
scripts/check-installed-headers.sh | 4 ++++
scripts/check-wrapper-headers.py | 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%)
@@ -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 \
similarity index 100%
rename from bits/math-vector-fortran.h
rename to math/finclude/math-vector-fortran.h
@@ -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
@@ -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(
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