diff options
author | marxin <mliska@suse.cz> | 2019-03-07 09:39:55 +0100 |
---|---|---|
committer | marxin <mliska@suse.cz> | 2019-03-07 09:40:24 +0100 |
commit | ae514971341dcc08ec7f8622493a65e7eb1ef9d2 (patch) | |
tree | 24a3ed4c081442c95df6c24023450a0533a018df | |
parent | 0ddb7ea842abf63516b74d4b057c052afc6ba863 (diff) | |
download | glibc-ae514971341dcc08ec7f8622493a65e7eb1ef9d2.tar.gz |
Fix location where math-vector-fortran.h is installed.
2019-03-07 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 files.
* scripts/check-wrapper-headers.py: Likewise.
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | math/Makefile | 2 | ||||
-rw-r--r-- | math/finclude/math-vector-fortran.h (renamed from bits/math-vector-fortran.h) | 0 | ||||
-rw-r--r-- | scripts/check-installed-headers.sh | 4 | ||||
-rw-r--r-- | scripts/check-wrapper-headers.py | 4 | ||||
-rw-r--r-- | sysdeps/x86/fpu/finclude/math-vector-fortran.h (renamed from sysdeps/x86/fpu/bits/math-vector-fortran.h) | 0 |
6 files changed, 19 insertions, 1 deletions
@@ -1,3 +1,13 @@ +2019-03-07 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 files. + * scripts/check-wrapper-headers.py: Likewise. + 2019-03-05 Adhemerval Zanella <adhemerval.zanella@linaro.org> * nptl/nptl-init.c (__have_futex_clock_realtime, 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 index 7c1e095094..7c1e095094 100644 --- a/bits/math-vector-fortran.h +++ b/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 index 36051cc73e..36051cc73e 100644 --- a/sysdeps/x86/fpu/bits/math-vector-fortran.h +++ b/sysdeps/x86/fpu/finclude/math-vector-fortran.h |