This is a follow up to
https://gcc.gnu.org/pipermail/gcc-patches/2021-August/576970.html
/https://gcc.gnu.org/r12-2808-g527a1cf32c27a3fbeaf6be7596241570d864cc4c
<https://gcc.gnu.org/r12-2808-g527a1cf32c27a3fbeaf6be7596241570d864cc4c>
It turned out that -I $specpath/libgfortran caused gfortran to regard the
IEEE_*.mod
files in that directory as non-intrinsic user modules – which prevented all the
special
handling for the IEEE intrinsic module.
As discussed with Jakub on IRC, the simplest/best solution is to copy the
ISO_Fortran_binding.h file from the libgfortran build directory into a
separate 'include' subdirectory and use that one instead.
Additionally, I removed the -I flag as already the (pre-)existing
-B$specpath/libgfortran/ (with tailing '/'!) causes GCC to search
in <path>include for include files.
Tested on x86-64 by doing in-build-tree testing by running "make check-fortran";
plus by checking one ISO*.f90 testcase with --target_board=unix\{,-m32\} and
then
copying the command line and running it with 'strace -f', ensuring that the
correct
ISO_Fortran_binding.h is read for both '' (= -m64) and '-m32'.
I think the patch is obvious – especially as it matches what was discussed in
IRC,
but I will wait until later today until I commit it to permit for pre-commit
comments.
Thanks,
Tobias
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634
München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas
Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht
München, HRB 106955
gfortran: Fix in-build-tree testing [PR101305, PR101660]
ISO_Fortran_binding.h is written in the build dir - hence, a previous commit
added it as include directory for in-build-tree testing. However,
it turned out that -I$specdir/libgfortran interferes with reading .mod files
as they are then no longer regareded as intrinsic modules. Solution: Create
an extra include/ directory in the libgfortran build dir and copy
ISO_Fortran_binding.h to that directory. As -B$specdir/libgfortran already
causes gfortran to read that include subdirectory, the -I flag is no longer
needed.
PR libfortran/101305
PR fortran/101660
libgfortran/ChangeLog:
* Makefile.am (ISO_Fortran_binding.h): Create include/ in the build dir
and copy the include file to it.
(clean-local): Add for removing the 'include' directory.
* Makefile.in: Regenerate.
gcc/testsuite/ChangeLog:
* lib/gfortran.exp (gfortran_init): Remove -I$specpath/libgfortran
from the string used to set GFORTRAN_UNDER_TEST.
gcc/testsuite/lib/gfortran.exp | 2 +-
libgfortran/Makefile.am | 8 ++++++++
libgfortran/Makefile.in | 9 ++++++++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp
index cae6738b4b8..43f4d4eda17 100644
--- a/gcc/testsuite/lib/gfortran.exp
+++ b/gcc/testsuite/lib/gfortran.exp
@@ -184,7 +184,7 @@ proc gfortran_init { args } {
set specpath [get_multilibs]
}
set gfortran_init_set_GFORTRAN_UNDER_TEST 1
- set GFORTRAN_UNDER_TEST [findfile $base_dir/../../gfortran "$base_dir/../../gfortran -B$base_dir/../../ -B$specpath/libgfortran/ -I$specpath/libgfortran" [findfile $base_dir/gfortran "$base_dir/gfortran -B$base_dir/" [transform gfortran]]]
+ set GFORTRAN_UNDER_TEST [findfile $base_dir/../../gfortran "$base_dir/../../gfortran -B$base_dir/../../ -B$specpath/libgfortran/" [findfile $base_dir/gfortran "$base_dir/gfortran -B$base_dir/" [transform gfortran]]]
}
}
}
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index 3546a3f3711..47035dd8921 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -1076,6 +1076,9 @@ fpu-target.inc: fpu-target.h $(srcdir)/libgfortran.h
grep '^#define GFC_FPE_' < $(top_srcdir)/../gcc/fortran/libgfortran.h > $@ || true
grep '^#define GFC_FPE_' < $(srcdir)/libgfortran.h >> $@ || true
+# Place ISO_Fortran_binding.h also under include/ in the build directory such
+# that it can be used for in-built-tree testsuite runs without interference of
+# other files in the build dir - like intrinsic .mod files or other .h files.
ISO_Fortran_binding.h: $(srcdir)/ISO_Fortran_binding-1-tmpl.h \
$(srcdir)/ISO_Fortran_binding-2-tmpl.h \
$(srcdir)/ISO_Fortran_binding-3-tmpl.h \
@@ -1085,6 +1088,8 @@ ISO_Fortran_binding.h: $(srcdir)/ISO_Fortran_binding-1-tmpl.h \
$(COMPILE) -E -dD $(srcdir)/ISO_Fortran_binding-2-tmpl.h \
| grep '^#define CFI_type' >> $@
cat $(srcdir)/ISO_Fortran_binding-3-tmpl.h >> $@
+ $(MKDIR_P) include
+ cp $@ include/ISO_Fortran_binding.h
## A 'normal' build shouldn't need to regenerate these
## so we only include them in maintainer mode
@@ -1245,6 +1250,9 @@ $(gfor_misc_specifics): m4/misc_specifics.m4 m4/head.m4
## end of maintainer mode only rules
endif
+clean-local:
+ -rm -rf include
+
EXTRA_DIST = $(m4_files)
# target overrides
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index a7d8e11b5e4..dc9d6eafcc5 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -698,7 +698,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -7042,6 +7041,9 @@ fpu-target.inc: fpu-target.h $(srcdir)/libgfortran.h
grep '^#define GFC_FPE_' < $(top_srcdir)/../gcc/fortran/libgfortran.h > $@ || true
grep '^#define GFC_FPE_' < $(srcdir)/libgfortran.h >> $@ || true
+# Place ISO_Fortran_binding.h also under include/ in the build directory such
+# that it can be used for in-built-tree testsuite runs without interference of
+# other files in the build dir - like intrinsic .mod files or other .h files.
ISO_Fortran_binding.h: $(srcdir)/ISO_Fortran_binding-1-tmpl.h \
$(srcdir)/ISO_Fortran_binding-2-tmpl.h \
$(srcdir)/ISO_Fortran_binding-3-tmpl.h \
@@ -7051,6 +7053,8 @@ ISO_Fortran_binding.h: $(srcdir)/ISO_Fortran_binding-1-tmpl.h \
$(COMPILE) -E -dD $(srcdir)/ISO_Fortran_binding-2-tmpl.h \
| grep '^#define CFI_type' >> $@
cat $(srcdir)/ISO_Fortran_binding-3-tmpl.h >> $@
+ $(MKDIR_P) include
+ cp $@ include/ISO_Fortran_binding.h
@MAINTAINER_MODE_TRUE@$(i_all_c): m4/all.m4 $(I_M4_DEPS2)
@MAINTAINER_MODE_TRUE@ $(M4) -Dfile=$@ -I$(srcdir)/m4 all.m4 > $@
@@ -7205,6 +7209,9 @@ ISO_Fortran_binding.h: $(srcdir)/ISO_Fortran_binding-1-tmpl.h \
@MAINTAINER_MODE_TRUE@$(gfor_misc_specifics): m4/misc_specifics.m4 m4/head.m4
@MAINTAINER_MODE_TRUE@ $(M4) -Dfile=$@ -I$(srcdir)/m4 misc_specifics.m4 > $@
+clean-local:
+ -rm -rf include
+
# target overrides
-include $(tmake_file)
