From c8373ebb4ed77c361d95aa806cfbe1b4062b5be5 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 11 Aug 2015 21:54:48 +0930 Subject: [PATCH] Tweak binutils testsuite Some targets provide aligned .bss sections, so explicitly align. msp430 and rl78 emit "magic" symbols when assembling symbol.s, and mips targets emit STT_OBJECT rather than STT_NOTYPE syms. * binutils-all/strip-12.s: Align .bss section. * binutils-all/strip-12.d: Adjust. * binutils-all/symbols-1.d: Allow extraneous symbols. * binutils-all/symbols-2.d: Likewise, and V for weakened syms. * binutils-all/symbols-3.d: Likewise. * binutils-all/symbols-4.d: Likewise. --- binutils/testsuite/ChangeLog | 9 +++++++++ binutils/testsuite/binutils-all/strip-12.d | 2 +- binutils/testsuite/binutils-all/strip-12.s | 1 + binutils/testsuite/binutils-all/symbols-1.d | 1 + binutils/testsuite/binutils-all/symbols-2.d | 9 +++++---- binutils/testsuite/binutils-all/symbols-3.d | 9 +++++---- binutils/testsuite/binutils-all/symbols-4.d | 9 +++++---- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index 88b0d786adc..9efe4dcbf18 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2015-08-11 Alan Modra + + * binutils-all/strip-12.s: Align .bss section. + * binutils-all/strip-12.d: Adjust. + * binutils-all/symbols-1.d: Allow extraneous symbols. + * binutils-all/symbols-2.d: Likewise, and V for weakened syms. + * binutils-all/symbols-3.d: Likewise. + * binutils-all/symbols-4.d: Likewise. + 2015-08-08 Hans-Peter Nilsson * binutils-all/strip-12.s: Use ".section .bss" instead of ".bss" diff --git a/binutils/testsuite/binutils-all/strip-12.d b/binutils/testsuite/binutils-all/strip-12.d index a33faab2f69..e2ce4dc0043 100644 --- a/binutils/testsuite/binutils-all/strip-12.d +++ b/binutils/testsuite/binutils-all/strip-12.d @@ -3,5 +3,5 @@ #readelf: -S --wide #... - \[[ 0-9]+\] \.bss[ \t]+NOBITS[ \t0-9a-f]+WA[ \t]+0[ \t]+0[ \t]+1 + \[[ 0-9]+\] \.bss[ \t]+NOBITS[ \t0-9a-f]+WA[ \t]+0[ \t]+0[ \t]+16 #pass diff --git a/binutils/testsuite/binutils-all/strip-12.s b/binutils/testsuite/binutils-all/strip-12.s index 020cecc8950..9a48f92b314 100644 --- a/binutils/testsuite/binutils-all/strip-12.s +++ b/binutils/testsuite/binutils-all/strip-12.s @@ -1,4 +1,5 @@ .section .bss + .p2align 4 .space 8 .section .debug_str,"MS",%progbits,1 .string "" diff --git a/binutils/testsuite/binutils-all/symbols-1.d b/binutils/testsuite/binutils-all/symbols-1.d index 41314bdc279..a2d8f55bc3c 100644 --- a/binutils/testsuite/binutils-all/symbols-1.d +++ b/binutils/testsuite/binutils-all/symbols-1.d @@ -5,6 +5,7 @@ #DUMPPROG: nm #nm: -n +#... 0+ D bar 0+ d foa 0+ d fob diff --git a/binutils/testsuite/binutils-all/symbols-2.d b/binutils/testsuite/binutils-all/symbols-2.d index 99950aaed5b..68fa6737ec3 100644 --- a/binutils/testsuite/binutils-all/symbols-2.d +++ b/binutils/testsuite/binutils-all/symbols-2.d @@ -5,10 +5,11 @@ #DUMPPROG: nm #nm: -n +#... 0+ D bar -0+ W foa -0+ W fob +0+ [VW] foa +0+ [VW] fob 0+ D foo -0+ W foo1 -0+ W foo2 +0+ [VW] foo1 +0+ [VW] foo2 diff --git a/binutils/testsuite/binutils-all/symbols-3.d b/binutils/testsuite/binutils-all/symbols-3.d index 9838e6785a0..0815238a46a 100644 --- a/binutils/testsuite/binutils-all/symbols-3.d +++ b/binutils/testsuite/binutils-all/symbols-3.d @@ -5,10 +5,11 @@ #DUMPPROG: nm #nm: -n +#... 0+ D bar -0+ W foa -0+ W fob +0+ [VW] foa +0+ [VW] fob 0+ d foo -0+ W foo1 -0+ W foo2 +0+ [VW] foo1 +0+ [VW] foo2 diff --git a/binutils/testsuite/binutils-all/symbols-4.d b/binutils/testsuite/binutils-all/symbols-4.d index bb984fdde2f..7480b0de591 100644 --- a/binutils/testsuite/binutils-all/symbols-4.d +++ b/binutils/testsuite/binutils-all/symbols-4.d @@ -5,10 +5,11 @@ #DUMPPROG: nm #nm: -n +#... 0+ D bar -0+ W foa -0+ W fob +0+ [VW] foa +0+ [VW] fob 0+ D foo -0+ W foo1 -0+ W foo2 +0+ [VW] foo1 +0+ [VW] foo2 -- 2.30.2