From c1862d0f60ee6050e3d4add7bbb1a595b1758473 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 13 Nov 2015 15:06:38 +0000 Subject: [PATCH] Remove d10v from testsuite This patch removes the leftover of the d10v stuff in the testsuite directory. The d10v port was removed in GDB 6.7, but I happen to see that there are still some leftovers about d10v in testsuite. gdb/testsuite: 2015-11-13 Yao Qi * gdb.base/call-sc.exp (test_scalar_returns): Remove the comments about d10v. (test_scalar_returns): Likewise. * gdb.base/d10v.ld: Remove. * gdb.base/overlays.exp: Remove the target triplet checking for d10v-*-*. * gdb.base/structs.exp (test_struct_returns): Remove the comments about d10v. (test_struct_calls): Likewise. --- gdb/testsuite/ChangeLog | 12 ++ gdb/testsuite/gdb.base/call-sc.exp | 7 +- gdb/testsuite/gdb.base/d10v.ld | 193 ---------------------------- gdb/testsuite/gdb.base/overlays.exp | 4 +- gdb/testsuite/gdb.base/structs.exp | 9 +- 5 files changed, 15 insertions(+), 210 deletions(-) delete mode 100644 gdb/testsuite/gdb.base/d10v.ld diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8730d2cb6b6..44ebf4402dc 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2015-11-13 Yao Qi + + * gdb.base/call-sc.exp (test_scalar_returns): Remove the + comments about d10v. + (test_scalar_returns): Likewise. + * gdb.base/d10v.ld: Remove. + * gdb.base/overlays.exp: Remove the target triplet checking for + d10v-*-*. + * gdb.base/structs.exp (test_struct_returns): Remove the + comments about d10v. + (test_struct_calls): Likewise. + 2015-11-13 Yao Qi * gdb.base/gnu_vector.exp: Check the return value by "p res". diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp index cb78f1517c8..fe5396b6c1a 100644 --- a/gdb/testsuite/gdb.base/call-sc.exp +++ b/gdb/testsuite/gdb.base/call-sc.exp @@ -386,9 +386,6 @@ proc test_scalar_returns { } { # NetBSD/PPC returns "unnatural" (3, 5, 6, 7) sized scalars in memory. -# d10v is weird. 5/6 byte scalars go in memory. 2 or more char -# scalars go in memory. Everything else is in a register! - # Test every single char struct from 1..17 in size. This is what the # original "scalars" test was doing. @@ -409,9 +406,7 @@ test_scalar_returns # The approx size of each structure it is computed assumed that tc=1, # ts=2, ti=4, tl=4, tll=8, tf=4, td=8, tld=16, and that all fields are -# naturally aligned. Padding being added where needed. Note that -# these numbers are just approx, the d10v has ti=2, a 64-bit has has -# tl=8. +# naturally aligned. Padding being added where needed. # Approx size: 2, 4, ... start_scalars_test ts diff --git a/gdb/testsuite/gdb.base/d10v.ld b/gdb/testsuite/gdb.base/d10v.ld deleted file mode 100644 index 41f085b1ed7..00000000000 --- a/gdb/testsuite/gdb.base/d10v.ld +++ /dev/null @@ -1,193 +0,0 @@ -OUTPUT_FORMAT("elf32-d10v", "elf32-d10v", - "elf32-d10v") -OUTPUT_ARCH(d10v) -ENTRY(_start) -/* Do we need any of these for elf? - __DYNAMIC = 0; */ - -MEMORY -{ - UNIFIED : org = 0, len = 0x1000000 - INSN : org = 0x1014000, len = 0x40000 - DATA : org = 0x2000004, len = 0x7FFC - STACK : org = 0x200BFFE, len = 4 -} - -SECTIONS -{ - /* Overlay sections: */ - .ovly0 0x1001000 : AT (0x8000) { foo.o(.text) } - .ovly1 0x1001000 : AT (0x9000) { bar.o(.text) } - .ovly2 0x1002000 : AT (0xa000) { baz.o(.text) } - .ovly3 0x1002000 : AT (0xb000) { grbx.o(.text) } - .data00 0x2001000 : AT (0xc000) { foo.o(.data) } - .data01 0x2001000 : AT (0xd000) { bar.o(.data) } - .data02 0x2002000 : AT (0xe000) { baz.o(.data) } - .data03 0x2002000 : AT (0xf000) { grbx.o(.data) } - - .text : - { - KEEP (*(.init)) - KEEP (*(.init.*)) - KEEP (*(.fini)) - KEEP (*(.fini.*)) - *(.text) - *(.text.*) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - *(.gnu.linkonce.t*) - _etext = .; - PROVIDE (etext = .); - } >INSN =0 - .rodata : { - *(.rodata) - *(.gnu.linkonce.r*) - *(.rodata.*) - } >DATA - .rodata1 : { - *(.rodata1) - *(.rodata1.*) - } >DATA - - .data : - { - *(.data) - *(.data.*) - *(.gnu.linkonce.d*) - _ovly_table = .; - LONG(ABSOLUTE(ADDR(.ovly0))); - LONG(SIZEOF(.ovly0)); - LONG(LOADADDR(.ovly0)); - LONG(0); - LONG(ABSOLUTE(ADDR(.ovly1))); - LONG(SIZEOF(.ovly1)); - LONG(LOADADDR(.ovly1)); - LONG(0); - LONG(ABSOLUTE(ADDR(.ovly2))); - LONG(SIZEOF(.ovly2)); - LONG(LOADADDR(.ovly2)); - LONG(0); - LONG(ABSOLUTE(ADDR(.ovly3))); - LONG(SIZEOF(.ovly3)); - LONG(LOADADDR(.ovly3)); - LONG(0); - LONG(ABSOLUTE(ADDR(.data00))); - LONG(SIZEOF(.data00)); - LONG(LOADADDR(.data00)); - LONG(0); - LONG(ABSOLUTE(ADDR(.data01))); - LONG(SIZEOF(.data01)); - LONG(LOADADDR(.data01)); - LONG(0); - LONG(ABSOLUTE(ADDR(.data02))); - LONG(SIZEOF(.data02)); - LONG(LOADADDR(.data02)); - LONG(0); - LONG(ABSOLUTE(ADDR(.data03))); - LONG(SIZEOF(.data03)); - LONG(LOADADDR(.data03)); - LONG(0); - _novlys = .; - LONG((_novlys - _ovly_table) / 16); - CONSTRUCTORS - } >DATA - .data1 : { - *(.data1) - *(.data1.*) - } >DATA - .ctors : - { - /* gcc uses crtbegin.o to find the start of - the constructors, so we make sure it is - first. Because this is a wildcard, it - doesn't matter if the user does not - actually link against crtbegin.o; the - linker won't look for a file to match a - wildcard. The wildcard also means that it - doesn't matter which directory crtbegin.o - is in. */ - - KEEP (*crtbegin.o(.ctors)) - - /* We don't want to include the .ctor section from - from the crtend.o file until after the sorted ctors. - The .ctor section from the crtend file contains the - end of ctors marker and it must be last */ - - KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - } >DATA - .dtors : - { - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - } >DATA - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ - .sdata : { - *(.sdata) - *(.sdata.*) - } >DATA - _edata = .; - PROVIDE (edata = .); - __bss_start = .; - .sbss : { *(.sbss) *(.scommon) } >DATA - .bss : - { - *(.dynbss) - *(.dynbss.*) - *(.bss) - *(.bss.*) - *(COMMON) - } >DATA - - _end = . ; - PROVIDE (end = .); - - .stack : { _stack = .; *(.stack) } >STACK - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - - .comment 0 : { *(.comment) } - - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } -} diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp index e623eab6ee8..6bee6745fae 100644 --- a/gdb/testsuite/gdb.base/overlays.exp +++ b/gdb/testsuite/gdb.base/overlays.exp @@ -22,9 +22,7 @@ set data_overlays 1 -if [istarget "d10v-*-*"] then { - set linker_script "${srcdir}/${subdir}/d10v.ld" -} elseif [istarget "m32r-*-*"] then { +if [istarget "m32r-*-*"] then { set linker_script "${srcdir}/${subdir}/m32r.ld" } elseif [istarget "spu-*-*"] then { set linker_script "${srcdir}/${subdir}/spu.ld" diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp index 5d94a41c5af..f22d08204e7 100644 --- a/gdb/testsuite/gdb.base/structs.exp +++ b/gdb/testsuite/gdb.base/structs.exp @@ -485,9 +485,6 @@ proc test_struct_returns { n } { # NetBSD/PPC returns "unnatural" (3, 5, 6, 7) sized structs in memory. -# d10v is weird. 5/6 byte structs go in memory. 2 or more char -# structs go in memory. Everything else is in a register! - # Test every single char struct from 1..17 in size. This is what the # original "structs" test was doing. @@ -531,9 +528,7 @@ test_struct_returns 8 # The approx size of each structure it is computed assumed that tc=1, # ts=2, ti=4, tl=4, tll=8, tf=4, td=8, tld=16, and that all fields are -# naturally aligned. Padding being added where needed. Note that -# these numbers are just approx, the d10v has ti=2, a 64-bit has has -# tl=8. +# naturally aligned. Padding being added where needed. # Approx size: 2, 4, ... start_structs_test { ts } @@ -683,13 +678,11 @@ test_struct_calls 2 # Some float combinations # Approx size: 8+4=12, 16, ... -# d10v: 4+4=8, 12, ... start_structs_test { td tf } test_struct_calls 2 test_struct_returns 2 # Approx size: (4+4)+8=16, 32, ... -# d10v: 4+4=8, 12, ... start_structs_test { tf td } test_struct_calls 2 test_struct_returns 2 -- 2.30.2