Support v850 expected failures.

diff --git a/binutils/testsuite/binutils-all/readelf.exp b/binutils/testsuite/binutils-all/readelf.exp
index 0214f78ea451f93607d63ad58b26346b5c80143a..c324239c9c43c6c725101be6c33b4dd9764e9795 100644 (file)
--- a/binutils/testsuite/binutils-all/readelf.exp
+++ b/binutils/testsuite/binutils-all/readelf.exp
@@ -125,7 +125,7 @@ proc regexp_diff { file_1 file_2 } {
 # Readelf's output is captured and then compared against the contents
 # of the regexp_file.
 
-proc readelf_test { options binary_file regexp_file } {
+proc readelf_test { options binary_file regexp_file xfails } {
 
     global READELF
     global READELFFLAGS
@@ -133,6 +133,10 @@ proc readelf_test { options binary_file regexp_file } {
     send_log "exec $READELF $READELFFLAGS $options $binary_file > readelf.out"
     catch "exec $READELF $READELFFLAGS $options $binary_file > readelf.out" got
 
+    if { [llength $xfails] != 0 } then {
+       setup_xfail $xfails
+    }
+    
     if ![string match "" $got] then {
        send_log $got
        fail "readelf $options"
@@ -184,7 +188,10 @@ if ![is_remote host] {
 }
 
 # Run the tests
-readelf_test -h $tempfile $srcdir/$subdir/readelf.h
-readelf_test -S $tempfile $srcdir/$subdir/readelf.s
-readelf_test -s $tempfile $srcdir/$subdir/readelf.ss
-readelf_test -r $tempfile $srcdir/$subdir/readelf.r
+readelf_test -h $tempfile $srcdir/$subdir/readelf.h  {}
+# The v850 fails the next two tests because it creates two special
+# sections of its own: .call_table_data and .call_table_text
+# The regexp scripts are not expecting these sections...
+readelf_test -S $tempfile $srcdir/$subdir/readelf.s  {v850*-*}
+readelf_test -s $tempfile $srcdir/$subdir/readelf.ss {v850*-*}
+readelf_test -r $tempfile $srcdir/$subdir/readelf.r  {}

diff --git a/binutils/testsuite/binutils-all/readelf.r b/binutils/testsuite/binutils-all/readelf.r
index 7f2074ea8563f1fe68336b173fdc48dd856633f8..4edef668cf9a25298524bbc4cddf9a7e32c12132 100644 (file)
--- a/binutils/testsuite/binutils-all/readelf.r
+++ b/binutils/testsuite/binutils-all/readelf.r
@@ -1,4 +1,4 @@
 
-Relocation section '.rel..text' at offset 0x2b8 contains 1 entries:
+Relocation section '.rel..text' at offset 0x.* contains 1 entries:
   Offset    Info  Type            Symbol's Value  Symbol's Name          Addend
   00000004  00.* R_.*           00000000  external_symbol           \+ 0

diff --git a/binutils/testsuite/binutils-all/readelf.ss b/binutils/testsuite/binutils-all/readelf.ss
index 6ff4d8ab8cc081cd377f12677bf7ab95ba69ccbf..01254e8d9e36347de3fcd960fec8d3b7949b8d8f 100644 (file)
--- a/binutils/testsuite/binutils-all/readelf.ss
+++ b/binutils/testsuite/binutils-all/readelf.ss
@@ -1,5 +1,5 @@
 
-Symbol table '.symtab' contains 10 entries:
+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 
@@ -7,7 +7,7 @@ Symbol table '.symtab' contains 10 entries:
     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
-    6:        0     0 NOTYPE  GLOBAL  0    1 text_symbol
-    7:        0     0 NOTYPE  GLOBAL  0  UND external_symbol
-    8:        0     0 NOTYPE  GLOBAL  0    3 data_symbol
-    9:        4     4 OBJECT  GLOBAL  0  COM common_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