8 files changed, 9 insertions, 20 deletions
diff --git a/gdb/testsuite/gdb.dwarf2/fission-base.S b/gdb/testsuite/gdb.dwarf2/fission-base.S
index 5e10713..e11500c 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-base.S
+++ b/gdb/testsuite/gdb.dwarf2/fission-base.S
@@ -20,9 +20,6 @@
    and then massaging the output.
 */
 
-#define XSTR(s) STR(s)
-#define STR(s) #s
-
 	.file	"fission-base.c"
 
 	.text
@@ -146,7 +143,7 @@ main:
 	.8byte	.Letext0-.Ltext0	# DW_AT_high_pc
 	.4byte	.Ldebug_line0	# DW_AT_stmt_list
 	.ascii "/tmp/src/gdb/testsuite\0"	# DW_AT_comp_dir
-	.asciz XSTR(DWO)	# DW_AT_GNU_dwo_name
+	.asciz DWO	# DW_AT_GNU_dwo_name
 	.4byte	.Ldebug_pubnames0	# DW_AT_GNU_pubnames
 	.4byte	.Ldebug_pubtypes0	# DW_AT_GNU_pubtypes
 	.4byte	.Ldebug_addr0_begin	# DW_AT_GNU_addr_base
diff --git a/gdb/testsuite/gdb.dwarf2/fission-base.exp b/gdb/testsuite/gdb.dwarf2/fission-base.exp
index 00eb7fe..e593310 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-base.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-base.exp
@@ -36,7 +36,7 @@ set obj [standard_output_file "${testfile}.o"]
 set dwo [standard_output_file "${testfile}.dwo"]
 if [build_executable_and_dwo_files "$testfile.exp" "${binfile}" {nodebug} \
 	[list $srcfile \
-	     [list nodebug split-dwo additional_flags=-DDWO=$dwo] \
+	     [list nodebug split-dwo additional_flags=-DDWO=\"$dwo\"] \
 	     $obj]] {
     return -1
 }
diff --git a/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.S b/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.S
index e87ca36..539029e 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.S
+++ b/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.S
@@ -33,8 +33,6 @@
      return init (&argc);
    }
 */
-#define XSTR(s) STR(s)
-#define STR(s) #s
 
 	.file	"fission-loclists-pie.c"
 	.text
@@ -463,7 +461,7 @@ main:
 .LASF1:
 	.string	"/tmp/19999/obj64/gdb/testsuite"
 .LASF0:
-	.string	XSTR(DWO)
+	.string	DWO
 	.section	.debug_str_offsets.dwo,"e",@progbits
 	.long	0	# indexed string 0x0: argv
 	.long	0x5	# indexed string 0x1: argc
diff --git a/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp b/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp
index 21098a2..773e200 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp
@@ -41,7 +41,7 @@ set obj [standard_output_file "${testfile}.o"]
 set dwo [standard_output_file "${testfile}.dwo"]
 if [build_executable_and_dwo_files "$testfile.exp" "${binfile}" \
 	{nodebug ldflags=-pie} \
-	[list $srcfile [list nodebug split-dwo additional_flags=-DDWO=$dwo] \
+	[list $srcfile [list nodebug split-dwo additional_flags=-DDWO=\"$dwo\"] \
 	     $obj]] {
     return -1
 }
diff --git a/gdb/testsuite/gdb.dwarf2/fission-loclists.S b/gdb/testsuite/gdb.dwarf2/fission-loclists.S
index c40b956..6a187b8 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-loclists.S
+++ b/gdb/testsuite/gdb.dwarf2/fission-loclists.S
@@ -33,9 +33,6 @@
    }
 */
 
-#define XSTR(s) STR(s)
-#define STR(s) #s
-
 	.file	"fission-loclists.c"
 	.text
 .Ltext0:
@@ -243,7 +240,7 @@ main:
 	.byte	0x5
 	.4byte	.Ldebug_ranges0	# DW_AT_GNU_ranges_base
 	.ascii "/tmp/src/gdb/testsuite\0"	# DW_AT_comp_dir
-	.asciz XSTR(DWO)	# DW_AT_GNU_dwo_name
+	.asciz DWO	# DW_AT_GNU_dwo_name
 	.4byte	.Ldebug_pubnames0	# DW_AT_GNU_pubnames
 	.4byte	.Ldebug_pubtypes0	# DW_AT_GNU_pubtypes
 	.4byte	.Ldebug_addr0	# DW_AT_GNU_addr_base
diff --git a/gdb/testsuite/gdb.dwarf2/fission-loclists.exp b/gdb/testsuite/gdb.dwarf2/fission-loclists.exp
index c490763..be4e4ad 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-loclists.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-loclists.exp
@@ -36,7 +36,7 @@ set obj [standard_output_file "${testfile}.o"]
 set dwo [standard_output_file "${testfile}.dwo"]
 if [build_executable_and_dwo_files "$testfile.exp" "${binfile}" {nodebug} \
 	[list $srcfile \
-	     [list nodebug split-dwo additional_flags=-DDWO=$dwo] \
+	     [list nodebug split-dwo additional_flags=-DDWO=\"$dwo\"] \
 	     $obj]] {
     return -1
 }
diff --git a/gdb/testsuite/gdb.dwarf2/fission-reread.S b/gdb/testsuite/gdb.dwarf2/fission-reread.S
index dd1ffcd..fcbcecb 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-reread.S
+++ b/gdb/testsuite/gdb.dwarf2/fission-reread.S
@@ -47,9 +47,6 @@
 # define SYMBOL(str)     str
 #endif
 
-#define XSTR(s) STR(s)
-#define STR(s) #s
-
 	.file	"fission-reread.cc"
 
 	.globl	SYMBOL(baz)
@@ -146,7 +143,7 @@ SYMBOL(main):
 	.4byte	0	/* Offset to Type DIE */
 	.uleb128 0x2	/* (DIE (0) DW_TAG_type_unit) */
 	.ascii "/tmp/src/gdb/testsuite\0"	/* DW_AT_comp_dir */
-	.asciz XSTR(DWO) /* DW_AT_GNU_dwo_name */
+	.asciz DWO /* DW_AT_GNU_dwo_name */
 	.4byte	.Ldebug_pubnames0	/* DW_AT_GNU_pubnames */
 	.4byte	.Ldebug_pubtypes0	/* DW_AT_GNU_pubtypes */
 	.4byte	.Ldebug_addr0	/* DW_AT_GNU_addr_base */
@@ -217,7 +214,7 @@ SYMBOL(main):
 	.4byte	.Letext0-.Ltext0	/* DW_AT_high_pc */
 	.4byte	.Ldebug_line0	/* DW_AT_stmt_list */
 	.ascii "/tmp/src/gdb/testsuite\0"	/* DW_AT_comp_dir */
-	.asciz XSTR(DWO) /* DW_AT_GNU_dwo_name */
+	.asciz DWO /* DW_AT_GNU_dwo_name */
 	.4byte	.Ldebug_pubnames0	/* DW_AT_GNU_pubnames */
 	.4byte	.Ldebug_pubtypes0	/* DW_AT_GNU_pubtypes */
 	.4byte	.Ldebug_addr0	/* DW_AT_GNU_addr_base */
diff --git a/gdb/testsuite/gdb.dwarf2/fission-reread.exp b/gdb/testsuite/gdb.dwarf2/fission-reread.exp
index 661e90b..3cbcbde 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-reread.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-reread.exp
@@ -40,7 +40,7 @@ if { $additional_flags != "" } {
 
 set dwo_options $options
 lappend dwo_options split-dwo
-lappend dwo_options additional_flags=-DDWO=$dwo
+lappend dwo_options additional_flags=-DDWO=\"$dwo\"
 
 if [build_executable_and_dwo_files "$testfile.exp" "${binfile}" $options \
 	[list $srcfile $dwo_options $obj]] {