[Patch ]Fix bintest.s failure after previous AArch64 map symbol commit

2015-03-26  Renlin Li  <renlin.li@arm.com>

binutils/testsuite/
  * binutils-all/readelf.s-64: Support aarch64 case.
  * binutils-all/readelf.ss-64: Likewise.

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 0f33df9..2b86817 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-26  Renlin Li  <renlin.li@arm.com>
+
+       * binutils-all/readelf.s-64: Support aarch64 case.
+       * binutils-all/readelf.ss-64: Likewise.
+
 2015-03-11  Alan Modra  <amodra@gmail.com>
 
        * binutils-all/update-section.exp: Only run on ELF targets.

diff --git a/binutils/testsuite/binutils-all/readelf.s-64 b/binutils/testsuite/binutils-all/readelf.s-64
index 2e05d68..acebab9 100644 (file)
--- a/binutils/testsuite/binutils-all/readelf.s-64
+++ b/binutils/testsuite/binutils-all/readelf.s-64
@@ -16,7 +16,8 @@ Section Headers:
  +\[ 5\] .shstrtab +STRTAB +0000000000000000 +000000(4c|50|54|58)
  +00000000000000.. +0000000000000000 +0 +0 +.*
  +\[ 6\] .symtab +SYMTAB +0000000000000000 +0+.*
- +0+.* +0000000000000018 +7 +6 +8
+# aarch64-elf targets have one more data symbol.
+ +0+.* +0000000000000018 +7 +(6|7) +8
  +\[ 7\] .strtab +STRTAB +0000000000000000 +0+.*
  +0+.* +0000000000000000 +0 +0 +1
 Key to Flags:

diff --git a/binutils/testsuite/binutils-all/readelf.ss-64 b/binutils/testsuite/binutils-all/readelf.ss-64
index c100c14..4372591 100644 (file)
--- a/binutils/testsuite/binutils-all/readelf.ss-64
+++ b/binutils/testsuite/binutils-all/readelf.ss-64
@@ -6,8 +6,10 @@ Symbol table '.symtab' contains .* entries:
  +2: 0000000000000000 +0 +SECTION +LOCAL +DEFAULT +3 
  +3: 0000000000000000 +0 +SECTION +LOCAL +DEFAULT +4 
  +4: 0000000000000000 +0 +NOTYPE +LOCAL +DEFAULT +1 static_text_symbol
- +5: 0000000000000000 +0 +NOTYPE +LOCAL +DEFAULT +3 static_data_symbol
+# aarch64-elf targets add the $d mapping symbol here...
+#...
+ +.: 0000000000000000 +0 +NOTYPE +LOCAL +DEFAULT +3 static_data_symbol
 .* +.: 0000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +1 text_symbol
  +.: 0000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +UND external_symbol
  +.: 0000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +3 data_symbol
- +.: 0000000000000004 +4 +(COMMON|OBJECT) +GLOBAL +DEFAULT +COM common_symbol
+ +[0-9]+: 0000000000000004 +4 +(COMMON|OBJECT) +GLOBAL +DEFAULT +COM common_symbol