From 0f60cce3e191b9e72e7577a0da73ecc5e9ba353b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 31 Aug 2018 04:38:12 -0700 Subject: [PATCH] binutils: Adjusted tests for .note.gnu.property section Since x86 assembler may generate .note.gnu.property section, adjust binutils tests to handle it. * testsuite/binutils-all/readelf.s-64: Adjusted for .note.gnu.property section. * testsuite/binutils-all/strip-3.d: Also strip .note.gnu.property section. --- binutils/ChangeLog | 7 +++++++ binutils/testsuite/binutils-all/readelf.s-64 | 11 +++++++---- binutils/testsuite/binutils-all/strip-3.d | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 99f76cd..c993ad5 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,12 @@ 2018-08-31 H.J. Lu + * testsuite/binutils-all/readelf.s-64: Adjusted for + .note.gnu.property section. + * testsuite/binutils-all/strip-3.d: Also strip + .note.gnu.property section. + +2018-08-31 H.J. Lu + * testsuite/binutils-all/i386/compressed-1b.d: Pass -mx86-used-note=no to assembler. * testsuite/binutils-all/i386/compressed-1c.d: Likewise. diff --git a/binutils/testsuite/binutils-all/readelf.s-64 b/binutils/testsuite/binutils-all/readelf.s-64 index 622b314..a1e6cd1 100644 --- a/binutils/testsuite/binutils-all/readelf.s-64 +++ b/binutils/testsuite/binutils-all/readelf.s-64 @@ -13,12 +13,15 @@ Section Headers: +000000000000000[48] +0000000000000000 +WA +0 +0 +.* +\[ 4\] .bss +NOBITS +0000000000000000 +000000(4c|50|54|58) +0000000000000000 +0000000000000000 +WA +0 +0 +.* - +\[ 5\] .symtab +SYMTAB +0000000000000000 +0+.* +# x86 targets may put .note.gnu.property here. +#... + +\[ .\] .symtab +SYMTAB +0000000000000000 +0+.* # aarch64-elf targets have one more data symbol. - +0+.* +0000000000000018 +6 +(6|7) +8 - +\[ 6\] .strtab +STRTAB +0000000000000000 +0+.* +# x86 targets may have .note.gnu.property. + +0+.* +0000000000000018 +(6|7) +(6|7) +8 + +\[ .\] .strtab +STRTAB +0000000000000000 +0+.* +0+.* +0000000000000000 .* +0 +0 +1 - +\[ 7\] .shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ + +\[ .\] .shstrtab +STRTAB +0000000000000000 +[0-9a-f]+ +00000000000000.. +0000000000000000 .* +0 +0 +.* Key to Flags: #... diff --git a/binutils/testsuite/binutils-all/strip-3.d b/binutils/testsuite/binutils-all/strip-3.d index 190298c..8a375d8 100644 --- a/binutils/testsuite/binutils-all/strip-3.d +++ b/binutils/testsuite/binutils-all/strip-3.d @@ -1,6 +1,6 @@ #PROG: strip #source: empty.s -#strip: -R .text -R .data -R .bss -R .ARM.attributes -R .reginfo -R .gnu.attributes -R .MIPS.abiflags -R .pdr -R .xtensa.info -R .ARC.attributes +#strip: -R .text -R .data -R .bss -R .ARM.attributes -R .reginfo -R .gnu.attributes -R .MIPS.abiflags -R .pdr -R .xtensa.info -R .ARC.attributes -R .note.gnu.property #readelf: -S --wide #name: strip empty file #target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi -- 2.7.4