From c8df10fc707ec1f30767d96f508a99b8c0f901aa Mon Sep 17 00:00:00 2001
From: Felix Willgerodt <felix.willgerodt@intel.com>
Date: Tue, 31 May 2022 16:43:43 +0200
Subject: [PATCH] gdb/testsuite: Fix fortran types for Intel compilers.

Newer Intel compilers emit their dwarf type name in a slightly different
format.  Therefore, this needs adjustment to make more tests pass in the
Fortran testsuite.

Co-authored-by: Abdul Basit Ijaz <abdul.b.ijaz@intel.com>
Co-authored-by: Nils-Christian Kempke <nils-christian.kempke@intel.com>
---
 gdb/testsuite/lib/fortran.exp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gdb/testsuite/lib/fortran.exp b/gdb/testsuite/lib/fortran.exp
index a97c6eeb4e3..9531d393a1b 100644
--- a/gdb/testsuite/lib/fortran.exp
+++ b/gdb/testsuite/lib/fortran.exp
@@ -38,6 +38,8 @@ proc fortran_int4 {} {
 	return "integer"
     } elseif {[test_compiler_info {icc-*}]} {
 	return "INTEGER\\(4\\)"
+    } elseif {[test_compiler_info {intel-*}]} {
+	return "INTEGER\\*4"
     } else {
 	return "unknown"
     }
@@ -52,6 +54,8 @@ proc fortran_int8 {} {
 	return "integer\\*8"
     } elseif {[test_compiler_info {icc-*}]} {
 	return "INTEGER\\(8\\)"
+    } elseif {[test_compiler_info {intel-*}]} {
+	return "INTEGER\\*8"
     } else {
 	return "unknown"
     }
@@ -66,6 +70,8 @@ proc fortran_real4 {} {
 	return "real"
     } elseif {[test_compiler_info {icc-*}]} {
 	return "REAL\\(4\\)"
+    } elseif {[test_compiler_info {intel-*}]} {
+	return "REAL\\*4"
     } else {
 	return "unknown"
     }
@@ -80,6 +86,8 @@ proc fortran_real8 {} {
 	return "double precision"
     } elseif {[test_compiler_info {icc-*}]} {
 	return "REAL\\(8\\)"
+    } elseif {[test_compiler_info {intel-*}]} {
+	return "REAL\\*8"
     } else {
 	return "unknown"
     }
@@ -94,6 +102,8 @@ proc fortran_complex4 {} {
 	return "complex"
     } elseif {[test_compiler_info {icc-*}]} {
 	return "COMPLEX\\(4\\)"
+    } elseif {[test_compiler_info {intel-*}]} {
+	return "COMPLEX\\*8"
     } else {
 	return "unknown"
     }
@@ -108,6 +118,8 @@ proc fortran_complex8 {} {
 	return "double complex"
     } elseif {[test_compiler_info {icc-*}]} {
 	return "COMPLEX\\(8\\)"
+    } elseif {[test_compiler_info {intel-*}]} {
+	return "COMPLEX\\*16"
     } else {
 	return "unknown"
     }
@@ -122,6 +134,8 @@ proc fortran_complex16 {} {
 	return "quad complex"
     } elseif {[test_compiler_info {icc-*}]} {
 	return "COMPLEX\\(16\\)"
+    } elseif {[test_compiler_info {intel-*}]} {
+	return "COMPLEX\\*32"
     } else {
 	return "unknown"
     }
@@ -136,6 +150,8 @@ proc fortran_logical4 {} {
 	return "logical"
     } elseif {[test_compiler_info {icc-*}]} {
 	return "LOGICAL\\(4\\)"
+    } elseif {[test_compiler_info {intel-*}]} {
+	return "LOGICAL\\*4"
     } else {
 	return "unknown"
     }
@@ -150,6 +166,8 @@ proc fortran_character1 {} {
 	return "character"
     } elseif {[test_compiler_info {icc-*}]} {
 	return "CHARACTER\\(1\\)"
+    } elseif {[test_compiler_info {intel-*}]} {
+	return "CHARACTER\\*1"
     } else {
 	return "unknown"
     }
-- 
2.30.2