gdb/testsuite: add Fortran compiler identification to GDB

This commit adds a separate Fortran compiler identification mechanism to
the testsuite, similar to the existing one for C/C++.  Before this
change, the options and version for the Fortran compiler specified when
running the testsuite with F90_FOR_TARGET set, was detected via its
respective C compiler.  So running the testsuite as

  make check TEST=gdb.fortran/*.exp CC_FOR_TARGET=gcc F90_FOR_TARGET=ifx

or even

  make check TEST=gdb.fortran/*.exp F90_FOR_TARGET=ifx

would use the gcc compiler inside the procedures get_compiler_info and
test_compiler_info to identify compiler flags and the compiler version.
This could sometimes lead to unpredictable outputs.  It also limited
testsuite execution to combinations where C and Fortran compiler would
come from the same family of compiers (gcc/gfortran, icc/ifort, icx/ifx,
clang/flang ..).  This commit enables GDB to detect C and Fortran
compilers independently of each other.

As most/nearly all Fortran compilers have a mechanism for preprocessing
files in a C like fashion we added the exact same meachnism that already
existed for C/CXX.  We let GDB preprocess a file with the compilers
Fortran preprocessor and evaluate the preprocessor defined macros in that
file.

This enables GDB to properly run heterogeneous combinations of C and
Fortran compilers such as

  CC_FOR_TARGET='gcc' and F90_FOR_TARGET='ifort'

or enables one to run the testsuite without specifying a C compiler as in

  make check TESTS=gdb.fortran/*.exp F90_FOR_TARGET='ifx'
  make check TESTS=gdb.fortran/*.exp F90_FOR_TARGET='flang'

On the other hand this also requires one to always specify a
identification mechanism for Fortran compilers in the compiler.F90 file.

We added identification for GFORTRAN, FLANG (CLASSIC and LLVM) IFX,
IFORT, and ARMFLANG for now.

Classic and LLVM flang were each tested with their latest releases on
their respective release pages.  Both get recognized by the new compiler
identification and we introduced the two names flang-classic and
flang-llvm to distinguish the two.  While LLVM flang is not quite mature
enough yet for running the testsuite we still thought it would be a good
idea to include it already.  For this we added a case for the fortran_main
procedure.  LLVM flang uses 'MAIN__' as opposed to classic flang which
uses 'MAIN_' here.

We did not have the possibility to test ARMFLANG - the versioning scheme
here was extracted from its latest online documentation.

We changed the test_compiler_info procedure to take another optional
argument, the language string, which will be passed though to the
get_compiler_info procedure.  Passing 'f90' or 'c++' here will then
trigger the C++/Fortran compiler identification within
get_compiler_info.  The latter procedure was extended to also handle
the 'f90' argument (similarly to the already existing 'c++' one).

Co-authored-by: Nils-Christian Kempke <nils-christian.kempke@intel.com>

1 files changed, 50 insertions, 50 deletions

diff --git a/gdb/testsuite/lib/fortran.exp b/gdb/testsuite/lib/fortran.exp
index 9531d39..9ee4208 100644
--- a/gdb/testsuite/lib/fortran.exp
+++ b/gdb/testsuite/lib/fortran.exp
@@ -30,15 +30,15 @@ proc set_lang_fortran {} {
 }
 
 proc fortran_int4 {} {
-    if {[test_compiler_info {gcc-4-[012]-*}]} {
+    if {[test_compiler_info {gfortran-4-[012]-*} f90]} {
 	return "int4"
-    } elseif {[test_compiler_info {gcc-*}]} {
+    } elseif {[test_compiler_info {gfortran-*} f90]} {
 	return "integer\\(kind=4\\)"
-    } elseif {[test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {flang-*} f90]} {
 	return "integer"
-    } elseif {[test_compiler_info {icc-*}]} {
+    } elseif {[test_compiler_info {ifort-*} f90]} {
 	return "INTEGER\\(4\\)"
-    } elseif {[test_compiler_info {intel-*}]} {
+    } elseif {[test_compiler_info {ifx-*} f90]} {
 	return "INTEGER\\*4"
     } else {
 	return "unknown"
@@ -46,15 +46,15 @@ proc fortran_int4 {} {
 }
 
 proc fortran_int8 {} {
-    if {[test_compiler_info {gcc-4-[012]-*}]} {
+    if {[test_compiler_info {gfortran-4-[012]-*} f90]} {
 	return "int8"
-    } elseif {[test_compiler_info {gcc-*}]} {
+    } elseif {[test_compiler_info {gfortran-*} f90]} {
 	return "integer\\(kind=8\\)"
-    } elseif {[test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {flang-*} f90]} {
 	return "integer\\*8"
-    } elseif {[test_compiler_info {icc-*}]} {
+    } elseif {[test_compiler_info {ifort-*} f90]} {
 	return "INTEGER\\(8\\)"
-    } elseif {[test_compiler_info {intel-*}]} {
+    } elseif {[test_compiler_info {ifx-*} f90]} {
 	return "INTEGER\\*8"
     } else {
 	return "unknown"
@@ -62,15 +62,15 @@ proc fortran_int8 {} {
 }
 
 proc fortran_real4 {} {
-    if {[test_compiler_info {gcc-4-[012]-*}]} {
+    if {[test_compiler_info {gfortran-4-[012]-*} f90]} {
 	return "real4"
-    } elseif {[test_compiler_info {gcc-*}]} {
+    } elseif {[test_compiler_info {gfortran-*} f90]} {
 	return "real\\(kind=4\\)"
-    } elseif {[test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {flang-*} f90]} {
 	return "real"
-    } elseif {[test_compiler_info {icc-*}]} {
+    } elseif {[test_compiler_info {ifort-*} f90]} {
 	return "REAL\\(4\\)"
-    } elseif {[test_compiler_info {intel-*}]} {
+    } elseif {[test_compiler_info {ifx-*} f90]} {
 	return "REAL\\*4"
     } else {
 	return "unknown"
@@ -78,15 +78,15 @@ proc fortran_real4 {} {
 }
 
 proc fortran_real8 {} {
-    if {[test_compiler_info {gcc-4-[012]-*}]} {
+    if {[test_compiler_info {gfortran-4-[012]-*} f90]} {
 	return "real8"
-    } elseif {[test_compiler_info {gcc-*}]} {
+    } elseif {[test_compiler_info {gfortran-*} f90]} {
 	return "real\\(kind=8\\)"
-    } elseif {[test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {flang-*} f90]} {
 	return "double precision"
-    } elseif {[test_compiler_info {icc-*}]} {
+    } elseif {[test_compiler_info {ifort-*} f90]} {
 	return "REAL\\(8\\)"
-    } elseif {[test_compiler_info {intel-*}]} {
+    } elseif {[test_compiler_info {ifx-*} f90]} {
 	return "REAL\\*8"
     } else {
 	return "unknown"
@@ -94,15 +94,15 @@ proc fortran_real8 {} {
 }
 
 proc fortran_complex4 {} {
-    if {[test_compiler_info {gcc-4-[012]-*}]} {
+    if {[test_compiler_info {gfortran-4-[012]-*} f90]} {
 	return "complex4"
-    } elseif {[test_compiler_info {gcc-*}]} {
+    } elseif {[test_compiler_info {gfortran-*} f90]} {
 	return "complex\\(kind=4\\)"
-    } elseif {[test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {flang-*} f90]} {
 	return "complex"
-    } elseif {[test_compiler_info {icc-*}]} {
+    } elseif {[test_compiler_info {ifort-*} f90]} {
 	return "COMPLEX\\(4\\)"
-    } elseif {[test_compiler_info {intel-*}]} {
+    } elseif {[test_compiler_info {ifx-*} f90]} {
 	return "COMPLEX\\*8"
     } else {
 	return "unknown"
@@ -110,15 +110,15 @@ proc fortran_complex4 {} {
 }
 
 proc fortran_complex8 {} {
-    if {[test_compiler_info {gcc-4-[012]-*}]} {
+    if {[test_compiler_info {gfortran-4-[012]-*} f90]} {
 	return "complex8"
-    } elseif {[test_compiler_info {gcc-*}]} {
+    } elseif {[test_compiler_info {gfortran-*} f90]} {
 	return "complex\\(kind=8\\)"
-    } elseif {[test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {flang-*} f90]} {
 	return "double complex"
-    } elseif {[test_compiler_info {icc-*}]} {
+    } elseif {[test_compiler_info {ifort-*} f90]} {
 	return "COMPLEX\\(8\\)"
-    } elseif {[test_compiler_info {intel-*}]} {
+    } elseif {[test_compiler_info {ifx-*} f90]} {
 	return "COMPLEX\\*16"
     } else {
 	return "unknown"
@@ -126,15 +126,15 @@ proc fortran_complex8 {} {
 }
 
 proc fortran_complex16 {} {
-    if {[test_compiler_info {gcc-4-[012]-*}]} {
+    if {[test_compiler_info {gfortran-4-[012]-*} f90]} {
 	return "complex16"
-    } elseif {[test_compiler_info {gcc-*}]} {
+    } elseif {[test_compiler_info {gfortran-*} f90]} {
 	return "complex\\(kind=16\\)"
-    } elseif {[test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {flang-*} f90]} {
 	return "quad complex"
-    } elseif {[test_compiler_info {icc-*}]} {
+    } elseif {[test_compiler_info {ifort-*} f90]} {
 	return "COMPLEX\\(16\\)"
-    } elseif {[test_compiler_info {intel-*}]} {
+    } elseif {[test_compiler_info {ifx-*} f90]} {
 	return "COMPLEX\\*32"
     } else {
 	return "unknown"
@@ -142,15 +142,15 @@ proc fortran_complex16 {} {
 }
 
 proc fortran_logical4 {} {
-    if {[test_compiler_info {gcc-4-[012]-*}]} {
+    if {[test_compiler_info {gfortran-4-[012]-*} f90]} {
 	return "logical4"
-    } elseif {[test_compiler_info {gcc-*}]} {
+    } elseif {[test_compiler_info {gfortran-*} f90]} {
 	return "logical\\(kind=4\\)"
-    } elseif {[test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {flang-*} f90]} {
 	return "logical"
-    } elseif {[test_compiler_info {icc-*}]} {
+    } elseif {[test_compiler_info {ifort-*} f90]} {
 	return "LOGICAL\\(4\\)"
-    } elseif {[test_compiler_info {intel-*}]} {
+    } elseif {[test_compiler_info {ifx-*} f90]} {
 	return "LOGICAL\\*4"
     } else {
 	return "unknown"
@@ -158,15 +158,15 @@ proc fortran_logical4 {} {
 }
 
 proc fortran_character1 {} {
-    if {[test_compiler_info {gcc-4-[012]-*}]} {
+    if {[test_compiler_info {gfortran-4-[012]-*} f90]} {
 	return "character1"
-    } elseif {[test_compiler_info {gcc-*}]} {
+    } elseif {[test_compiler_info {gfortran-*} f90]} {
 	return "character\\(kind=1\\)"
-    } elseif {[test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {flang-*} f90]} {
 	return "character"
-    } elseif {[test_compiler_info {icc-*}]} {
+    } elseif {[test_compiler_info {ifort-*} f90]} {
 	return "CHARACTER\\(1\\)"
-    } elseif {[test_compiler_info {intel-*}]} {
+    } elseif {[test_compiler_info {ifx-*} f90]} {
 	return "CHARACTER\\*1"
     } else {
 	return "unknown"
@@ -176,12 +176,12 @@ proc fortran_character1 {} {
 # Return name of the main procedure based on the compiler version.
 
 proc fortran_main {} {
-    if {[test_compiler_info {gcc-4-[012]-*}]
-         || [test_compiler_info {gcc-*}]
-         || [test_compiler_info {icc-*}]
-         || [test_compiler_info {intel-*}]} {
+    if {[test_compiler_info {gfortran-*} f90]
+	|| [test_compiler_info {ifort-*} f90]
+	|| [test_compiler_info {ifx-*} f90]
+	|| [test_compiler_info {flang-llvm-*} f90]} {
 	return "MAIN__"
-    } elseif {[test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {flang-classic-*} f90]} {
 	return "MAIN_"
     } else {
 	return "unknown"