fix to match latest readelf output

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 39a3d8b..078f8d5 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-13  Nick Clifton  <nickc@cygnus.com>
+
+       * binutils-all/readelf.s: Adjust to match noew format of readelf
+       output. 
+       * binutils-all/readelf.ss: Adjust to match noew format of readelf 
+       output. 
+
 1999-11-01  Nick Clifton  <nickc@cygnus.com>
 
        * binutils-all/objcopy.exp: Expect simple objcopy test for fail

diff --git a/binutils/testsuite/binutils-all/readelf.s b/binutils/testsuite/binutils-all/readelf.s
index 58b1245..89ae0fc 100644 (file)
--- a/binutils/testsuite/binutils-all/readelf.s
+++ b/binutils/testsuite/binutils-all/readelf.s
@@ -2,12 +2,15 @@ There are .* section headers, starting at offset .*:
 
 Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
-  \[ 0\]                   NULL            00000000 000000 000000 00      0   0 0
-  \[ 1\] .text             PROGBITS        00000000 000034 000008 00  AX  0   0 .
-  \[ 2\] .rel.+text +REL. +0+ 0+.* 00000. 0.      .   1 4
-  \[ 3\] .data             PROGBITS        00000000 00003c 000004 00 WA   0   0 .
-  \[ 4\] .bss              NOBITS          00000000 000040 000000 00 WA   0   0 .
-  \[ 5\] .shstrtab         STRTAB          00000000 000040 0000.* 00      0   0 .
-  \[ 6\] .symtab           SYMTAB          00000000 0+.* 0+.* 10      7   6 4
-  \[ 7\] .strtab           STRTAB          00000000 0+.* 0+.* 00      0   0 1
+  \[ 0\]                   NULL            00000000 000000 000000 00       0   0 0
+  \[ 1\] .text             PROGBITS        00000000 000034 000008 00  AX   0   0 .
+  \[ 2\] .rel.+text +REL. +0+ 0+.* 00000. 0.       .   1 4
+  \[ 3\] .data             PROGBITS        00000000 00003c 000004 00  WA   0   0 .
+  \[ 4\] .bss              NOBITS          00000000 000040 000000 00  WA   0   0 .
+  \[ .\] .shstrtab         STRTAB          00000000 000040 0000.* 00       0   0 .
+  \[ .\] .symtab           SYMTAB          00000000 0+.* 0+.* 10       7   6 4
+  \[ .\] .strtab           STRTAB          00000000 0+.* 0+.* 00       0   0 1
+Key to Flags: W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
+              I \(info\), L \(link order\), O \(extra OS processing required\)
+              o \(os specific\), p \(processor specific\) x \(unknown\)
 

diff --git a/binutils/testsuite/binutils-all/readelf.ss b/binutils/testsuite/binutils-all/readelf.ss
index 3760b38..926612d 100644 (file)
--- a/binutils/testsuite/binutils-all/readelf.ss
+++ b/binutils/testsuite/binutils-all/readelf.ss
@@ -1,13 +1,13 @@
 
 Symbol table '.symtab' contains .* entries:
-  Num:    Value  Size Type    Bind   Ot  Ndx Name
-    0:        0     0 NOTYPE  LOCAL   0  UND 
-    1:        0     0 SECTION LOCAL   0    1 
-    2:        0     0 SECTION LOCAL   0    3 
-    3:        0     0 SECTION LOCAL   0    4 
-    4:        0     0 NOTYPE  LOCAL   0    1 static_text_symbol
-    5:        0     0 NOTYPE  LOCAL   0    3 static_data_symbol
-    .:        0     0 NOTYPE  GLOBAL  0    1 text_symbol
-    .:        0     0 NOTYPE  GLOBAL  0  UND external_symbol
-   .*:        0     0 NOTYPE  GLOBAL  0    3 data_symbol
-   .*:        4     4 OBJECT  GLOBAL  0  COM common_symbol
+   Num:    Value  Size Type    Bind   Vis      Ndx Name
+     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+     1: 00000000     0 SECTION LOCAL  DEFAULT    1 
+     2: 00000000     0 SECTION LOCAL  DEFAULT    3 
+     3: 00000000     0 SECTION LOCAL  DEFAULT    4 
+     4: 00000000     0 NOTYPE  LOCAL  DEFAULT    1 static_text_symbol
+     5: 00000000     0 NOTYPE  LOCAL  DEFAULT    3 static_data_symbol
+.*   .: 00000000     0 NOTYPE  GLOBAL DEFAULT    1 text_symbol
+     .: 00000000     0 NOTYPE  GLOBAL DEFAULT  UND external_symbol
+     .: 00000000     0 NOTYPE  GLOBAL DEFAULT    3 data_symbol
+     .: 00000004     4 OBJECT  GLOBAL DEFAULT  COM common_symbol