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
	PR testsuite/101847

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.

(cherry picked from commit 2ba0376ac40447ce7ee09fcef00511c18db25dfa)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 9a1b2f9d425aafba69373b7c1c9c0c601672df44..4385c18ca7be4326d0c6e154899f94e5a93e7f81 100644 (file)
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,16 @@
+2021-08-11  Sandra Loosemore  <sandra@codesourcery.com>
+
+       Backported from master:
+
+       2021-08-10  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR libfortran/101305
+       PR fortran/101660
+       PR testsuite/101847
+
+       * lib/gfortran.exp (gfortran_init): Remove -I$specpath/libgfortran
+       from the string used to set GFORTRAN_UNDER_TEST.
+
 2021-08-11  Sandra Loosemore  <sandra@codesourcery.com>
 
        Backported from master:

diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp
index cae6738b4b8f82f0c10b20dfe5b180bb59d0a46c..43f4d4eda17be757897969fc31c4854a5cad1311 100644 (file)
--- 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/ChangeLog.omp b/libgfortran/ChangeLog.omp
index 2f96fd20c078134dd060b2a89c14591bf2585ffc..ff31c38439a14df93265c2b470d7e0edeb43c95f 100644 (file)
--- a/libgfortran/ChangeLog.omp
+++ b/libgfortran/ChangeLog.omp
@@ -1,3 +1,17 @@
+2021-08-11  Sandra Loosemore  <sandra@codesourcery.com>
+
+       Backported from master:
+
+       2021-08-10  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR libfortran/101305
+       PR fortran/101660
+       PR testsuite/101847
+       * 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.
+
 2021-08-11  Sandra Loosemore  <sandra@codesourcery.com>
 
        Backported from master:

diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index 3546a3f3711ee6130522a4e11f5e8a3cdc1e7cec..8d104321567d4b151362a18e563a9c7a5a7cd5d4 100644 (file)
--- 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,9 @@ 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
+       -rm -f include/ISO_Fortran_binding.h
+       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 +1251,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 a7d8e11b5e41028cdf45b8b31ef692068f194a19..afe1ed17cb4dc9171091649263f8e8811a92d36e 100644 (file)
--- 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,9 @@ 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
+       -rm -f include/ISO_Fortran_binding.h
+       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 +7210,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)