From 9a5911c08beefe3739d941af8fd44330df8f4931 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Fri, 19 Jul 2013 10:01:26 +0000 Subject: [PATCH] gdb/testsuite/gdb.dwarf2: Replace @ with % for ARM compatability. The ARM assembler recognises @ symbol as a comment marker and therefore is unable to assemble some of gdb.dwarf2 testsuite tests. This patch replaces all occurrences of @ symbol with % sign to allow tests stay compatible with both ARM and x86 assembly. This patch has been tested on x86_64 and ARMv7 targets. gdb/testsuite/ChangeLog: 2013-07-19 Omair Javaid * gdb.dwarf2/fission-reread.S: Replace @ sign with % sign to remove assembler errors on arm. * gdb.dwarf2/mac-fileno.S: Likewise. * gdb.dwarf2/member-ptr-forwardref.S: Likewise. * gdb.dwarf2/pr13961.S: Likewise. --- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.dwarf2/fission-reread.S | 4 ++-- gdb/testsuite/gdb.dwarf2/mac-fileno.S | 2 +- .../gdb.dwarf2/member-ptr-forwardref.S | 18 +++++++++--------- gdb/testsuite/gdb.dwarf2/pr13961.S | 16 ++++++++-------- 5 files changed, 28 insertions(+), 20 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0056b2a58f1..e59abe0ba86 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2013-07-19 Omair Javaid + + * gdb.dwarf2/fission-reread.S: Replace @ sign with % sign to remove + assembler errors on arm. + * gdb.dwarf2/mac-fileno.S: Likewise. + * gdb.dwarf2/member-ptr-forwardref.S: Likewise. + * gdb.dwarf2/pr13961.S: Likewise. + 2013-07-19 Hui Zhu PR gdb/15692 diff --git a/gdb/testsuite/gdb.dwarf2/fission-reread.S b/gdb/testsuite/gdb.dwarf2/fission-reread.S index 5e610083a9b..c5988240657 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-reread.S +++ b/gdb/testsuite/gdb.dwarf2/fission-reread.S @@ -43,7 +43,7 @@ .globl baz .data /* Previously this used .bss, but it's not portable. */ .align 4 - .type baz, @object + .type baz, %object .size baz, 4 baz: .zero 4 @@ -51,7 +51,7 @@ baz: .text .Ltext0: .globl main - .type main, @function + .type main, %function main: .LFB0: .file 1 "fission-reread.cc" diff --git a/gdb/testsuite/gdb.dwarf2/mac-fileno.S b/gdb/testsuite/gdb.dwarf2/mac-fileno.S index 5f1f08af4e8..0f2da7b3e3b 100644 --- a/gdb/testsuite/gdb.dwarf2/mac-fileno.S +++ b/gdb/testsuite/gdb.dwarf2/mac-fileno.S @@ -200,7 +200,7 @@ func_cu1: .Lline1_end: - .section .debug_macinfo,"",@progbits + .section .debug_macinfo,"",%progbits .Ldebug_macinfo0: .byte 0x3 /* Start new file */ .uleb128 0x0 /* Included from line number 0 */ diff --git a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.S b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.S index 14a44b17014..304a736f436 100644 --- a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.S +++ b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.S @@ -31,24 +31,24 @@ } c; */ .file "member-ptr-forwardref.cc" - .section .debug_abbrev,"",@progbits + .section .debug_abbrev,"",%progbits .Ldebug_abbrev0: - .section .debug_info,"",@progbits + .section .debug_info,"",%progbits .Ldebug_info0: - .section .debug_line,"",@progbits + .section .debug_line,"",%progbits .Ldebug_line0: .text .Ltext0: .globl fp .data .align 4 - .type fp, @object + .type fp, %object .size fp, 8 fp: .zero 8 .globl c .align 4 - .type c, @object + .type c, %object .size c, 8 c: .zero 8 @@ -290,7 +290,7 @@ c: .byte 0x0 .byte 0x0 .byte 0x0 - .section .debug_pubnames,"",@progbits + .section .debug_pubnames,"",%progbits .4byte 0x1b /* Length of Public Names Info */ .2byte 0x2 /* DWARF Version */ .4byte .Ldebug_info0 /* Offset of Compilation Unit Info */ @@ -300,7 +300,7 @@ c: .4byte 0x9c /* DIE offset */ .ascii "c\0" /* external name */ .4byte 0x0 - .section .debug_pubtypes,"",@progbits + .section .debug_pubtypes,"",%progbits .4byte 0x1d /* Length of Public Type Names Info */ .2byte 0x2 /* DWARF Version */ .4byte .Ldebug_info0 /* Offset of Compilation Unit Info */ @@ -310,7 +310,7 @@ c: .4byte 0x6e /* DIE offset */ .ascii "C\0" /* external name */ .4byte 0x0 - .section .debug_str,"MS",@progbits,1 + .section .debug_str,"MS",%progbits,1 .LASF5: .string "fp_t" .LASF2: @@ -324,4 +324,4 @@ c: .LASF1: .string "__delta" .ident "GCC: (GNU) 4.4.2 20091222 (Red Hat 4.4.2-20)" - .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",%progbits diff --git a/gdb/testsuite/gdb.dwarf2/pr13961.S b/gdb/testsuite/gdb.dwarf2/pr13961.S index de66dbb01b1..68c3134a96d 100644 --- a/gdb/testsuite/gdb.dwarf2/pr13961.S +++ b/gdb/testsuite/gdb.dwarf2/pr13961.S @@ -42,7 +42,7 @@ .globl baz .data /* Previously this used .bss, but it's not portable. */ .align 4 - .type baz, @object + .type baz, %object .size baz, 4 baz: #if 0 @@ -56,7 +56,7 @@ baz: .text .Ltext0: .globl main - .type main, @function + .type main, %function main: .LFB0: .4byte 0 @@ -64,7 +64,7 @@ main: .size main, .-main .Letext0: - .section .debug_types,"",@progbits + .section .debug_types,"",%progbits .Ldebug_types0: .4byte .Ltu_end - .Ltu_start /* Length of Compilation Unit Info */ .Ltu_start: @@ -121,7 +121,7 @@ main: .Ltu_end: - .section .debug_info,"",@progbits + .section .debug_info,"",%progbits .Ldebug_info0: .4byte .Lcu_end - .Lcu_start /* Length of Compilation Unit Info */ .Lcu_start: @@ -205,7 +205,7 @@ main: .Lcu_end: - .section .debug_abbrev,"",@progbits + .section .debug_abbrev,"",%progbits .Ldebug_abbrev0: .uleb128 0x1 /* (abbrev code) */ .uleb128 0x41 /* (TAG: DW_TAG_type_unit) */ @@ -333,7 +333,7 @@ main: .byte 0 - .section .debug_aranges,"",@progbits + .section .debug_aranges,"",%progbits .4byte 0x1c /* Length of Address Ranges Info */ .2byte 0x2 /* DWARF Version */ .4byte .Ldebug_info0 /* Offset of Compilation Unit Info */ @@ -346,10 +346,10 @@ main: .4byte 0 .4byte 0 - .section .debug_line,"",@progbits + .section .debug_line,"",%progbits .Ldebug_line0: - .section .debug_str,"MS",@progbits,1 + .section .debug_str,"MS",%progbits,1 .LASF0: .string "GNU C++ 4.6.3 20120306" .LASF2: -- 2.30.2