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.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 99f76cd3c2c1c2e44419707b0ae62de52be8e8de..c993ad5c5762d4074e25db91517440bb6b2a68b2 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2018-08-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * 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  <hongjiu.lu@intel.com>
 
        * testsuite/binutils-all/i386/compressed-1b.d: Pass

diff --git a/binutils/testsuite/binutils-all/readelf.s-64 b/binutils/testsuite/binutils-all/readelf.s-64
index 622b314503c6c474e54f8f81a58125f6b4dfa025..a1e6cd1bbd8cb4a4c54cb18db2ab86e602783747 100644 (file)
--- 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 190298c99d7067f1f2bbf8a1dabaf686606c7ad5..8a375d81dc0c06eab39ca51a26a2d7b99b43d30e 100644 (file)
--- 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