Updated to match latest output.

3 files changed, 29 insertions, 27 deletions

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index a81cd0c..d47908a 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-10  Nick Clifton  <nickc@cygnus.com>
+
+	* binutils-all/readelf.wi: Update to match latest output.
+	* binutils-all/readelf.h: Update to match latest output.
+
 Wed Jun  9 11:59:22 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
 
 	* binutils-all/objdump.exp: Tighten regexp to match `objdump -i'
diff --git a/binutils/testsuite/binutils-all/readelf.h b/binutils/testsuite/binutils-all/readelf.h
index 0f2a9ac..810eab5 100644
--- a/binutils/testsuite/binutils-all/readelf.h
+++ b/binutils/testsuite/binutils-all/readelf.h
@@ -1,5 +1,5 @@
 ELF Header:
-  Magic:   7f 45 4c 46 0[12] 0[12] 01 00 00 00 00 00 00 00 00 00 
+  Magic:   7f 45 4c 46 0[12] 0[12] 01 .. 00 00 00 00 00 00 00 00 
   Class:                             ELF[36][24]
   Data:                              2's complement,.* endian
   Version:                           1 \(current\)
@@ -8,7 +8,6 @@ ELF Header:
   Type:                              REL \(Relocatable file\)
   Machine:                           .*
   Version:                           0x1
-  Data:                              ELFDATA.* endian\)
   Entry point address:               0x0
   Start of program headers:          0 \(bytes into file\)
   Start of section headers:          .* \(bytes into file\)
diff --git a/binutils/testsuite/binutils-all/readelf.wi b/binutils/testsuite/binutils-all/readelf.wi
index 3cb2ecc..e022fff 100644
--- a/binutils/testsuite/binutils-all/readelf.wi
+++ b/binutils/testsuite/binutils-all/readelf.wi
@@ -5,7 +5,7 @@ The section .debug_info contains:
    Version:       2
    Abbrev Offset: 0
    Pointer Size:  4
-    Abbrev Number: 1 \(DW_TAG_compile_unit\)
+ <.><.*>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
      DW_AT_name        : .*/testprog.c	
      DW_AT_comp_dir    : .*/binutils	
      DW_AT_producer    : GNU C .*	
@@ -13,66 +13,64 @@ The section .debug_info contains:
      DW_AT_low_pc      : 0	
      DW_AT_high_pc     : .*	
      DW_AT_stmt_list   : 0	
-    Abbrev Number: 2 \(DW_TAG_subprogram\)
+ <.><.*>: Abbrev Number: 2 \(DW_TAG_subprogram\)
      DW_AT_external    : 1	
      DW_AT_name        : fn	
      DW_AT_decl_file   : 1	
-     DW_AT_decl_line   : a	
+     DW_AT_decl_line   : 10	
      DW_AT_type        : .*	
      DW_AT_low_pc      : 0	
      DW_AT_high_pc     : .*	
      DW_AT_frame_base  : 1 byte block: .*
-    Abbrev Number: 3 \(DW_TAG_base_type\)
+ <.><.*>: Abbrev Number: 3 \(DW_TAG_base_type\)
      DW_AT_name        : int	
      DW_AT_byte_size   : 4	
      DW_AT_encoding    : 5	\(signed\)
-    Abbrev Number: 4 \(DW_TAG_subprogram\)
+ <.><.*>: Abbrev Number: 4 \(DW_TAG_subprogram\)
      DW_AT_sibling     : .*	
      DW_AT_external    : 1	
      DW_AT_name        : main	
      DW_AT_decl_file   : 1	
-     DW_AT_decl_line   : 10	
+     DW_AT_decl_line   : 16	
      DW_AT_type        : .*	
      DW_AT_low_pc      : .*	
      DW_AT_high_pc     : .*	
      DW_AT_frame_base  : 1 byte block: .*
-    Abbrev Number: 5 \(DW_TAG_lexical_block\)
+ <.><.*>: Abbrev Number: 5 \(DW_TAG_lexical_block\)
      DW_AT_low_pc      : .*	
      DW_AT_high_pc     : .*	
-
-   Extra data at end of comp unit:
- .*: Abbrev Number: 6 \(DW_TAG_variable\)
+ <.><.*>: Abbrev Number: 6 \(DW_TAG_variable\)
      DW_AT_name        : common	
      DW_AT_decl_file   : 1	
      DW_AT_decl_line   : 3	
-     DW_AT_type        : .*
+     DW_AT_type        : <.*>	
      DW_AT_external    : 1	
-     DW_AT_location    : 5 byte block: 3 . 0 0 0 	\(DW_OP_addr: 0\)
- .*: Abbrev Number: 6 \(DW_TAG_variable\)
+     DW_AT_location    : 5 byte block: 3 0 0 0 0 	\(DW_OP_addr: 0\)
+ <.><.*>: Abbrev Number: 6 \(DW_TAG_variable\)
      DW_AT_name        : global	
      DW_AT_decl_file   : 1	
      DW_AT_decl_line   : 4	
-     DW_AT_type        : .*	
+     DW_AT_type        : <.*>	
      DW_AT_external    : 1	
-     DW_AT_location    : 5 byte block: 3 . 0 0 0 	\(DW_OP_addr: 0\)
- .*: Abbrev Number: 7 \(DW_TAG_variable\)
+     DW_AT_location    : 5 byte block: 3 0 0 0 0 	\(DW_OP_addr: 0\)
+ <.><.*>: Abbrev Number: 7 \(DW_TAG_variable\)
      DW_AT_name        : local	
      DW_AT_decl_file   : 1	
      DW_AT_decl_line   : 5	
-     DW_AT_type        : .*	
+     DW_AT_type        : <.*>	
      DW_AT_location    : 5 byte block: 3 . 0 0 . 	\(DW_OP_addr: .\)
- .*: Abbrev Number: 8 \(DW_TAG_array_type\)
-     DW_AT_sibling     : .*	
-     DW_AT_type        : .*	
- .*: Abbrev Number: 9 \(DW_TAG_subrange_type\)
+ <.><.*>: Abbrev Number: 8 \(DW_TAG_array_type\)
+     DW_AT_sibling     : <.*>	
+     DW_AT_type        : <.*>	
+ <.><.*>: Abbrev Number: 9 \(DW_TAG_subrange_type\)
      DW_AT_upper_bound : 6	
- .*: Abbrev Number: 3 \(DW_TAG_base_type\)
+ <.><.*>: Abbrev Number: 3 \(DW_TAG_base_type\)
      DW_AT_name        : char	
      DW_AT_byte_size   : 1	
-     DW_AT_encoding    : .	\(.* char\)
- .*: Abbrev Number: 7 \(DW_TAG_variable\)
+     DW_AT_encoding    : 8	\(unsigned char\)
+ <.><.*>: Abbrev Number: 7 \(DW_TAG_variable\)
      DW_AT_name        : string	
      DW_AT_decl_file   : 1	
      DW_AT_decl_line   : 6	
-     DW_AT_type        : .*	
+     DW_AT_type        : <.*>	
      DW_AT_location    : 5 byte block: 3 . 0 0 . 	\(DW_OP_addr: .\)