From b04aa1fc8c9d4a79e6293a3a1df7507052afedf3 Mon Sep 17 00:00:00 2001
From: Gary Benson <gbenson@redhat.com>
Date: Tue, 25 Aug 2020 15:25:04 +0100
Subject: [PATCH] Disable Clang's integrated assembler for two testcases

gdb.dwarf2/dw2-dir-file-name.exp fails to build using Clang because
the generated assembly language contains .ascii directives with more
than one string literal.  gdb.dwarf2/dw2-restore.exp fails to build
using Clang because it contains .func and .endfunc directives.
This commit causes Clang to invoke the system assembler to assemble
the relevant files.

gdb/testsuite/ChangeLog:

	* gdb.dwarf2/dw2-dir-file-name.exp: Use system assembler
	when compiling with clang.
	* gdb.dwarf2/dw2-restore.exp: Likewise
---
 gdb/testsuite/ChangeLog                        | 6 ++++++
 gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp | 6 ++++++
 gdb/testsuite/gdb.dwarf2/dw2-restore.exp       | 9 ++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 93df7f9c5d2..a945a5786b1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2020-08-25  Gary Benson <gbenson@redhat.com>
+
+	* gdb.dwarf2/dw2-dir-file-name.exp: Use system assembler
+	when compiling with clang.
+	* gdb.dwarf2/dw2-restore.exp: Likewise
+
 2020-08-25  Gary Benson <gbenson@redhat.com>
 
 	* gdb.cp/ambiguous.exp: Enable test when compiling with GCC.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
index 0de71f29d50..973325f55f2 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
@@ -333,6 +333,12 @@ lappend opts "additional_flags=-DFDIR=\"fdir\""
 # CU's DW_AT_name and .debug_line's filename.
 lappend opts "additional_flags=-DFILE=\"${srctmpfile}\""
 
+# Clang's integrated assembler doesn't support .ascii directives
+# with multiple string literals.
+if { [test_compiler_info clang*] } {
+    lappend opts "additional_flags=-fno-integrated-as"
+}
+
 if { [gdb_compile "${asmsrcfile} ${srcdir}/${subdir}/$srcfile" "${binfile}" executable $opts] != "" } {
     untested "failed to compile"
     return -1
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
index 993f79f29a4..04887db0dbd 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
@@ -21,8 +21,15 @@ if {![istarget x86_64-*] || ![is_lp64_target]} {
 }
 standard_testfile .S
 
+set opts [list {additional_flags=-nostdlib}]
+
+# Clang's integrated assembler doesn't support .func or .endfunc.
+if { [test_compiler_info clang*] } {
+    lappend opts [list {additional_flags=-fno-integrated-as}]
+}
+
 if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile] \
-	 [list {additional_flags=-nostdlib}]]} {
+	 $opts]} {
     return -1
 }
 
-- 
2.30.2