From b52fa57a42a335d50f03cfe4addd9d92e31851b6 Mon Sep 17 00:00:00 2001 From: marxin 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 * 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. --- math/Makefile | 2 +- {bits => math/finclude}/math-vector-fortran.h | 2 +- scripts/check-installed-headers.sh | 4 ++++ scripts/check-wrapper-headers.py | 4 ++++ sysdeps/x86/fpu/{bits => finclude}/math-vector-fortran.h | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) rename {bits => math/finclude}/math-vector-fortran.h (98%) rename sysdeps/x86/fpu/{bits => finclude}/math-vector-fortran.h (99%) 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 similarity index 98% rename from bits/math-vector-fortran.h rename to math/finclude/math-vector-fortran.h index 7c1e095094..66d467c22d 100644 --- a/bits/math-vector-fortran.h +++ b/math/finclude/math-vector-fortran.h @@ -1,4 +1,4 @@ -! Platform-specific declarations of SIMD math functions for Fortran. -*- f90 -*- +! Platform-specific declarations of SIMD math functions for Fortran. ! Copyright (C) 2019 Free Software Foundation, Inc. ! This file is part of the GNU C Library. ! diff --git a/scripts/check-installed-headers.sh b/scripts/check-installed-headers.sh index 8e7beffd82..e90bdc389f 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..fc3c25d7de 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 similarity index 99% rename from sysdeps/x86/fpu/bits/math-vector-fortran.h rename to sysdeps/x86/fpu/finclude/math-vector-fortran.h index 36051cc73e..4b69beed67 100644 --- a/sysdeps/x86/fpu/bits/math-vector-fortran.h +++ b/sysdeps/x86/fpu/finclude/math-vector-fortran.h @@ -1,4 +1,4 @@ -! Platform-specific declarations of SIMD math functions for Fortran. -*- f90 -*- +! Platform-specific declarations of SIMD math functions for Fortran. ! Copyright (C) 2019 Free Software Foundation, Inc. ! This file is part of the GNU C Library. ! -- 2.20.1