From b38b83dc8523d21c7648e706dc0245b4595b44b3 Mon Sep 17 00:00:00 2001 From: Matthew Fortune Date: Tue, 2 Sep 2014 08:25:23 +0100 Subject: [PATCH] MIPS testsuite cleanup - part 1 binutils/testsuite/ * binutils-all/readelf.ss-mips: Account for new sections. gas/testsuite/ * gas/elf/type.e: Account for new sections. * gas/mips/mips16-e.d: Likewise. * gas/mips/mips16-f.d: Likewise. * gas/mips/mipsel16-e.d: Likewise. * gas/mips/mipsel16-f.d: Likewise. * gas/mips/tmips16-e.d: Appropriately escape dots. * gas/mips/tmips16-f.d: Likewise. * gas/mips/tmipsel16-e.d: Likewise. * gas/mips/tmipsel16-f.d: Likewise. --- binutils/testsuite/ChangeLog | 4 ++++ .../testsuite/binutils-all/readelf.ss-mips | 18 ++++++++++-------- gas/testsuite/ChangeLog | 12 ++++++++++++ gas/testsuite/gas/elf/type.e | 14 +++++++------- gas/testsuite/gas/mips/mips16-e.d | 7 +++++++ gas/testsuite/gas/mips/mips16-f.d | 7 +++++++ gas/testsuite/gas/mips/mipsel16-e.d | 7 +++++++ gas/testsuite/gas/mips/mipsel16-f.d | 7 +++++++ gas/testsuite/gas/mips/tmips16-e.d | 4 ++-- gas/testsuite/gas/mips/tmips16-f.d | 4 ++-- gas/testsuite/gas/mips/tmipsel16-e.d | 4 ++-- gas/testsuite/gas/mips/tmipsel16-f.d | 4 ++-- 12 files changed, 69 insertions(+), 23 deletions(-) diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index 5f0403daff7..8471e47d161 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2014-09-06 Matthew Fortune + + * binutils-all/readelf.ss-mips: Account for new sections. + 2014-07-29 Matthew Fortune * binutils-all/readelf.s: Account for .MIPS.abiflags and diff --git a/binutils/testsuite/binutils-all/readelf.ss-mips b/binutils/testsuite/binutils-all/readelf.ss-mips index fd975520c9b..01d3df19c39 100644 --- a/binutils/testsuite/binutils-all/readelf.ss-mips +++ b/binutils/testsuite/binutils-all/readelf.ss-mips @@ -1,15 +1,17 @@ -Symbol table '.symtab' contains 12 entries: +Symbol table '.symtab' contains 14 entries: +Num: +Value +Size +Type +Bind +Vis +Ndx +Name +0: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +UND +1: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.text) +2: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.data) +3: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.bss) +4: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.reginfo) - +5: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.pdr) - +6: 00000000 +0 +OBJECT +GLOBAL +DEFAULT +. text_symbol - +7: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +. static_text_symbol - +8: 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +UND external_symbol - +9: 00000000 +0 +OBJECT +GLOBAL +DEFAULT +. data_symbol - +10: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +. static_data_symbol - +11: 00000004 +4 +(COMMON|OBJECT) +GLOBAL +DEFAULT +(PRC|COM) common_symbol + +5: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.MIPS\.abiflags) + +6: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.pdr) + +7: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.gnu\.attributes) + +8: 00000000 +0 +OBJECT +GLOBAL +DEFAULT +. text_symbol + +9: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +. static_text_symbol + +10: 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +UND external_symbol + +11: 00000000 +0 +OBJECT +GLOBAL +DEFAULT +. data_symbol + +12: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +. static_data_symbol + +13: 00000004 +4 +(COMMON|OBJECT) +GLOBAL +DEFAULT +(PRC|COM) common_symbol diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 18305614ff9..3802eaad063 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2014-09-06 Matthew Fortune + + * gas/elf/type.e: Account for new sections. + * gas/mips/mips16-e.d: Likewise. + * gas/mips/mips16-f.d: Likewise. + * gas/mips/mipsel16-e.d: Likewise. + * gas/mips/mipsel16-f.d: Likewise. + * gas/mips/tmips16-e.d: Appropriately escape dots. + * gas/mips/tmips16-f.d: Likewise. + * gas/mips/tmipsel16-e.d: Likewise. + * gas/mips/tmipsel16-f.d: Likewise. + 2014-09-04 Matthew Fortune * gas/mips/mips.exp: Add mipsisa32 and mipsisa32el to diff --git a/gas/testsuite/gas/elf/type.e b/gas/testsuite/gas/elf/type.e index fbc9aac8a0f..a1159bf4fbc 100644 --- a/gas/testsuite/gas/elf/type.e +++ b/gas/testsuite/gas/elf/type.e @@ -1,7 +1,7 @@ - +.: 0+0 +1 +FUNC +LOCAL +DEFAULT +. function - +.: 0+1 +1 +IFUNC +LOCAL +DEFAULT +. indirect_function - +.: 0+0 +1 +OBJECT +LOCAL +DEFAULT +. object - +.: 0+1 +1 +TLS +LOCAL +DEFAULT +. tls_object - +..: 0+2 +1 +NOTYPE +LOCAL +DEFAULT +. notype - +..: 0+3 +1 +OBJECT +UNIQUE +DEFAULT +. unique_global - +..: 0+1 +1 +(COMMON|OBJECT) +GLOBAL +DEFAULT +COM common + +.+: 0+0 +1 +FUNC +LOCAL +DEFAULT +. function + +.+: 0+1 +1 +IFUNC +LOCAL +DEFAULT +. indirect_function + +.+: 0+0 +1 +OBJECT +LOCAL +DEFAULT +. object + +.+: 0+1 +1 +TLS +LOCAL +DEFAULT +. tls_object + +.+: 0+2 +1 +NOTYPE +LOCAL +DEFAULT +. notype + +.+: 0+3 +1 +OBJECT +UNIQUE +DEFAULT +. unique_global + +.+: 0+1 +1 +(COMMON|OBJECT) +GLOBAL +DEFAULT +COM common diff --git a/gas/testsuite/gas/mips/mips16-e.d b/gas/testsuite/gas/mips/mips16-e.d index 15e5587dd0a..09b193c3ba8 100644 --- a/gas/testsuite/gas/mips/mips16-e.d +++ b/gas/testsuite/gas/mips/mips16-e.d @@ -12,7 +12,9 @@ SYMBOL TABLE: 0+0000000 l d \.bss 0+0000000 (|\.bss) 0+0000000 l d foo 0+0000000 (|foo) 0+0000000 l d \.reginfo 0+0000000 (|\.reginfo) +0+0000000 l d \.MIPS\.abiflags 0+0000000 (|\.MIPS\.abiflags) 0+0000000 l d \.(mdebug|pdr) 0+0000000 (|\.mdebug|\.pdr) +0+0000000 l d \.gnu\.attributes 0+0000000 (|\.gnu\.attributes) 0+0000002 l \.text 0+0000000 0xf0 l1 0+0000004 l \.text 0+0000000 0xf0 \.L1.1 0+0000000 \*UND\* 0+0000000 g1 @@ -33,6 +35,11 @@ Contents of section \.text: Contents of section \.reginfo: 0000 00010000 00000000 00000000 00000000 .* 0010 00000000 00000000 .* +Contents of section \.MIPS\.abiflags: + .* + .* Contents of section foo: 0000 00000000 00000008 00000000 00000003 .* 0010 00000000 00000008 00000000 00000000 .* +Contents of section \.gnu\.attributes: + .* diff --git a/gas/testsuite/gas/mips/mips16-f.d b/gas/testsuite/gas/mips/mips16-f.d index 9a2ce3bbd38..6ca5bb99286 100644 --- a/gas/testsuite/gas/mips/mips16-f.d +++ b/gas/testsuite/gas/mips/mips16-f.d @@ -12,7 +12,9 @@ SYMBOL TABLE: 0+0000000 l d \.bss 0+0000000 (|\.bss) 0+0000000 l d foo 0+0000000 (|foo) 0+0000000 l d \.reginfo 0+0000000 (|\.reginfo) +0+0000000 l d \.MIPS\.abiflags 0+0000000 (|\.MIPS\.abiflags) 0+0000000 l d \.(mdebug|pdr) 0+0000000 (|\.mdebug|\.pdr) +0+0000000 l d \.gnu\.attributes 0+0000000 (|\.gnu\.attributes) 0+0000002 l \.text 0+0000000 0xf0 l1 @@ -26,5 +28,10 @@ Contents of section \.text: Contents of section \.reginfo: 0000 00010000 00000000 00000000 00000000 .* 0010 00000000 00000000 .* +Contents of section \.MIPS\.abiflags: + .* + .* Contents of section foo: 0000 00000003 00000000 00000000 00000000 .* +Contents of section \.gnu\.attributes: + .* diff --git a/gas/testsuite/gas/mips/mipsel16-e.d b/gas/testsuite/gas/mips/mipsel16-e.d index eaff6d8e689..2686e2c64ca 100644 --- a/gas/testsuite/gas/mips/mipsel16-e.d +++ b/gas/testsuite/gas/mips/mipsel16-e.d @@ -13,7 +13,9 @@ SYMBOL TABLE: 0+0000000 l d \.bss 0+0000000 (|\.bss) 0+0000000 l d foo 0+0000000 (|foo) 0+0000000 l d \.reginfo 0+0000000 (|\.reginfo) +0+0000000 l d \.MIPS\.abiflags 0+0000000 (|\.MIPS\.abiflags) 0+0000000 l d \.(mdebug|pdr) 0+0000000 (|\.mdebug|\.pdr) +0+0000000 l d \.gnu\.attributes 0+0000000 (|\.gnu\.attributes) 0+0000002 l \.text 0+0000000 0xf0 l1 0+0000004 l \.text 0+0000000 0xf0 \.L1.1 0+0000000 \*UND\* 0+0000000 g1 @@ -34,6 +36,11 @@ Contents of section \.text: Contents of section \.reginfo: 0000 00000100 00000000 00000000 00000000 .* 0010 00000000 00000000 .* +Contents of section \.MIPS\.abiflags: + .* + .* Contents of section foo: 0000 00000000 08000000 00000000 03000000 .* 0010 00000000 08000000 00000000 00000000 .* +Contents of section \.gnu\.attributes: + .* diff --git a/gas/testsuite/gas/mips/mipsel16-f.d b/gas/testsuite/gas/mips/mipsel16-f.d index 8c1e2ea6634..21756bdf0c0 100644 --- a/gas/testsuite/gas/mips/mipsel16-f.d +++ b/gas/testsuite/gas/mips/mipsel16-f.d @@ -13,7 +13,9 @@ SYMBOL TABLE: 0+0000000 l d \.bss 0+0000000 (|\.bss) 0+0000000 l d foo 0+0000000 (|foo) 0+0000000 l d \.reginfo 0+0000000 (|\.reginfo) +0+0000000 l d \.MIPS\.abiflags 0+0000000 (|\.MIPS\.abiflags) 0+0000000 l d \.(mdebug|pdr) 0+0000000 (|\.mdebug|\.pdr) +0+0000000 l d \.gnu\.attributes 0+0000000 (|\.gnu\.attributes) 0+0000002 l \.text 0+0000000 0xf0 l1 @@ -27,5 +29,10 @@ Contents of section \.text: Contents of section \.reginfo: 0000 00000100 00000000 00000000 00000000 .* 0010 00000000 00000000 .* +Contents of section \.MIPS\.abiflags: + .* + .* Contents of section foo: 0000 03000000 00000000 00000000 00000000 .* +Contents of section \.gnu\.attributes: + .* diff --git a/gas/testsuite/gas/mips/tmips16-e.d b/gas/testsuite/gas/mips/tmips16-e.d index 708ff1198a1..f4d1ae4fe70 100644 --- a/gas/testsuite/gas/mips/tmips16-e.d +++ b/gas/testsuite/gas/mips/tmips16-e.d @@ -36,11 +36,11 @@ Contents of section \.text: Contents of section \.reginfo: 0000 00010000 00000000 00000000 00000000 .* 0010 00000000 00000000 .* -Contents of section .MIPS.abiflags: +Contents of section \.MIPS\.abiflags: .* .* Contents of section foo: 0000 00000000 00000008 00000000 00000003 .* 0010 00000000 00000008 00000000 00000000 .* -Contents of section .gnu.attributes: +Contents of section \.gnu\.attributes: .* diff --git a/gas/testsuite/gas/mips/tmips16-f.d b/gas/testsuite/gas/mips/tmips16-f.d index 057122c0359..cb09276f42e 100644 --- a/gas/testsuite/gas/mips/tmips16-f.d +++ b/gas/testsuite/gas/mips/tmips16-f.d @@ -29,10 +29,10 @@ Contents of section \.text: Contents of section \.reginfo: 0000 00010000 00000000 00000000 00000000 .* 0010 00000000 00000000 .* -Contents of section .MIPS.abiflags: +Contents of section \.MIPS\.abiflags: .* .* Contents of section foo: 0000 00000003 00000000 00000000 00000000 .* -Contents of section .gnu.attributes: +Contents of section \.gnu\.attributes: .* diff --git a/gas/testsuite/gas/mips/tmipsel16-e.d b/gas/testsuite/gas/mips/tmipsel16-e.d index 839446bb109..ad3f3fa8b11 100644 --- a/gas/testsuite/gas/mips/tmipsel16-e.d +++ b/gas/testsuite/gas/mips/tmipsel16-e.d @@ -36,11 +36,11 @@ Contents of section \.text: Contents of section \.reginfo: 0000 00000100 00000000 00000000 00000000 .* 0010 00000000 00000000 .* -Contents of section .MIPS.abiflags: +Contents of section \.MIPS\.abiflags: .* .* Contents of section foo: 0000 00000000 08000000 00000000 03000000 .* 0010 00000000 08000000 00000000 00000000 .* -Contents of section .gnu.attributes: +Contents of section \.gnu\.attributes: .* diff --git a/gas/testsuite/gas/mips/tmipsel16-f.d b/gas/testsuite/gas/mips/tmipsel16-f.d index edc6068644c..503f8be57aa 100644 --- a/gas/testsuite/gas/mips/tmipsel16-f.d +++ b/gas/testsuite/gas/mips/tmipsel16-f.d @@ -29,10 +29,10 @@ Contents of section \.text: Contents of section \.reginfo: 0000 00000100 00000000 00000000 00000000 .* 0010 00000000 00000000 .* -Contents of section .MIPS.abiflags: +Contents of section \.MIPS\.abiflags: .* .* Contents of section foo: 0000 03000000 00000000 00000000 00000000 .* -Contents of section .gnu.attributes: +Contents of section \.gnu\.attributes: .* -- 2.30.2