gdb.fortran: Allow Flang kind printing in fortran testing

[deliverable/binutils-gdb.git] / gdb / testsuite / lib / fortran.exp

diff --git a/gdb/testsuite/lib/fortran.exp b/gdb/testsuite/lib/fortran.exp
index 54f32936773930b47e334607b91ac5a3643ba098..549ed657904fad2f6b1c11051f608b3e643b243b 100644 (file)
--- a/gdb/testsuite/lib/fortran.exp
+++ b/gdb/testsuite/lib/fortran.exp
@@ -32,9 +32,10 @@ proc set_lang_fortran {} {
 proc fortran_int4 {} {
     if {[test_compiler_info {gcc-4-[012]-*}]} {
        return "int4"
-    } elseif {[test_compiler_info {gcc-*}]
-             || [test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {gcc-*}]} {
        return "integer\\(kind=4\\)"
+    } elseif {[test_compiler_info {clang-*}]} {
+       return "integer"
     } elseif {[test_compiler_info {icc-*}]} {
        return "INTEGER\\(4\\)"
     } else {
@@ -45,9 +46,10 @@ proc fortran_int4 {} {
 proc fortran_int8 {} {
     if {[test_compiler_info {gcc-4-[012]-*}]} {
        return "int8"
-    } elseif {[test_compiler_info {gcc-*}]
-             || [test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {gcc-*}]} {
        return "integer\\(kind=8\\)"
+    } elseif {[test_compiler_info {clang-*}]} {
+       return "integer*8"
     } elseif {[test_compiler_info {icc-*}]} {
        return "INTEGER\\(8\\)"
     } else {
@@ -58,9 +60,10 @@ proc fortran_int8 {} {
 proc fortran_real4 {} {
     if {[test_compiler_info {gcc-4-[012]-*}]} {
        return "real4"
-    } elseif {[test_compiler_info {gcc-*}]
-             || [test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {gcc-*}]} {
        return "real\\(kind=4\\)"
+    } elseif {[test_compiler_info {clang-*}]} {
+       return "real"
     } elseif {[test_compiler_info {icc-*}]} {
        return "REAL\\(4\\)"
     } else {
@@ -71,9 +74,10 @@ proc fortran_real4 {} {
 proc fortran_real8 {} {
     if {[test_compiler_info {gcc-4-[012]-*}]} {
        return "real8"
-    } elseif {[test_compiler_info {gcc-*}]
-             || [test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {gcc-*}]} {
        return "real\\(kind=8\\)"
+    } elseif {[test_compiler_info {clang-*}]} {
+       return "double precision"
     } elseif {[test_compiler_info {icc-*}]} {
        return "REAL\\(8\\)"
     } else {
@@ -84,9 +88,10 @@ proc fortran_real8 {} {
 proc fortran_complex4 {} {
     if {[test_compiler_info {gcc-4-[012]-*}]} {
        return "complex4"
-    } elseif {[test_compiler_info {gcc-*}]
-             || [test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {gcc-*}]} {
        return "complex\\(kind=4\\)"
+    } elseif {[test_compiler_info {clang-*}]} {
+       return "complex"
     } elseif {[test_compiler_info {icc-*}]} {
        return "COMPLEX\\(4\\)"
     } else {
@@ -97,9 +102,10 @@ proc fortran_complex4 {} {
 proc fortran_logical4 {} {
     if {[test_compiler_info {gcc-4-[012]-*}]} {
        return "logical4"
-    } elseif {[test_compiler_info {gcc-*}]
-             || [test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {gcc-*}]} {
        return "logical\\(kind=4\\)"
+    } elseif {[test_compiler_info {clang-*}]} {
+       return "logical"
     } elseif {[test_compiler_info {icc-*}]} {
        return "LOGICAL\\(4\\)"
     } else {
@@ -110,9 +116,10 @@ proc fortran_logical4 {} {
 proc fortran_character1 {} {
     if {[test_compiler_info {gcc-4-[012]-*}]} {
        return "character1"
-    } elseif {[test_compiler_info {gcc-*}]
-             || [test_compiler_info {clang-*}]} {
+    } elseif {[test_compiler_info {gcc-*}]} {
        return "character\\(kind=1\\)"
+    } elseif {[test_compiler_info {clang-*}]} {
+       return "character"
     } elseif {[test_compiler_info {icc-*}]} {
        return "CHARACTER\\(1\\)"
     } else {