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.

diff --git a/ChangeLog b/ChangeLog
index 53c5d2f..ee9eebb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 fc41910..cb4eaec 100644 (file)
--- 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 8e7beff..1f44964 100644 (file)
--- 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 094faa3..dc9fd86 100644 (file)
--- 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