8a8cfb
commit ae514971341dcc08ec7f8622493a65e7eb1ef9d2
8a8cfb
Author: marxin <mliska@suse.cz>
8a8cfb
Date:   Thu Mar 7 09:39:55 2019 +0100
8a8cfb
8a8cfb
    Fix location where math-vector-fortran.h is installed.
8a8cfb
    
8a8cfb
    2019-03-07  Martin Liska  <mliska@suse.cz>
8a8cfb
    
8a8cfb
            * math/Makefile: Change location where math-vector-fortran.h is
8a8cfb
            installed.
8a8cfb
            * math/finclude/math-vector-fortran.h: Move from bits/math-vector-fortran.h.
8a8cfb
            * sysdeps/x86/fpu/finclude/math-vector-fortran.h: Move
8a8cfb
            from sysdeps/x86/fpu/bits/math-vector-fortran.h.
8a8cfb
            * scripts/check-installed-headers.sh: Skip Fortran header files.
8a8cfb
            * scripts/check-wrapper-headers.py: Likewise.
8a8cfb
8a8cfb
Conflicts:
8a8cfb
	scripts/check-wrapper-headers.py
8a8cfb
	  (Script does not exist downstream, change dropped.)
8a8cfb
8a8cfb
diff --git a/math/Makefile b/math/Makefile
8a8cfb
index 16e68754fc863ea2..df73d70840b61cd7 100644
8a8cfb
--- a/math/Makefile
8a8cfb
+++ b/math/Makefile
8a8cfb
@@ -26,7 +26,7 @@ headers		:= math.h bits/mathcalls.h bits/mathinline.h \
8a8cfb
 		   fpu_control.h complex.h bits/cmathcalls.h fenv.h \
8a8cfb
 		   bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \
8a8cfb
 		   bits/math-finite.h bits/math-vector.h \
8a8cfb
-		   bits/math-vector-fortran.h \
8a8cfb
+		   finclude/math-vector-fortran.h \
8a8cfb
 		   bits/libm-simd-decl-stubs.h bits/iscanonical.h \
8a8cfb
 		   bits/flt-eval-method.h bits/fp-fast.h bits/fp-logb.h \
8a8cfb
 		   bits/long-double.h bits/mathcalls-helper-functions.h \
8a8cfb
diff --git a/bits/math-vector-fortran.h b/math/finclude/math-vector-fortran.h
8a8cfb
similarity index 100%
8a8cfb
rename from bits/math-vector-fortran.h
8a8cfb
rename to math/finclude/math-vector-fortran.h
8a8cfb
diff --git a/scripts/check-installed-headers.sh b/scripts/check-installed-headers.sh
8a8cfb
index 4a062e9cdaa57978..7a1969b43a144ebb 100644
8a8cfb
--- a/scripts/check-installed-headers.sh
8a8cfb
+++ b/scripts/check-installed-headers.sh
8a8cfb
@@ -84,6 +84,10 @@ for header in "$@"; do
8a8cfb
         (sys/elf.h)
8a8cfb
             continue;;
8a8cfb
 
8a8cfb
+        # Skip Fortran headers.
8a8cfb
+        (finclude/*)
8a8cfb
+            continue;;
8a8cfb
+
8a8cfb
 	# sys/sysctl.h is unsupported for x32.
8a8cfb
 	(sys/sysctl.h)
8a8cfb
             case "$is_x32" in
8a8cfb
diff --git a/sysdeps/x86/fpu/bits/math-vector-fortran.h b/sysdeps/x86/fpu/finclude/math-vector-fortran.h
8a8cfb
similarity index 100%
8a8cfb
rename from sysdeps/x86/fpu/bits/math-vector-fortran.h
8a8cfb
rename to sysdeps/x86/fpu/finclude/math-vector-fortran.h