Add fr30 and mcore to expected cpus list.

Fix readelf -r test to not assume a fixed number of spaces in the output.

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index d47908a..2e9f2ea 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+1999-06-29  Nick Clifton  <nickc@cygnus.com>
+
+       * binutils-all/objdump.exp: Add fr30 and MCore to expected cpus
+       list. 
+
+       * binutils-all/readelf.r: Do not assume a fixed number of spaces
+       in the output.
+
 1999-06-10  Nick Clifton  <nickc@cygnus.com>
 
        * binutils-all/readelf.wi: Update to match latest output.

diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp
index 063db91..3bfb34c 100644 (file)
--- a/binutils/testsuite/binutils-all/objdump.exp
+++ b/binutils/testsuite/binutils-all/objdump.exp
@@ -33,7 +33,7 @@ send_user "Version [binutil_version $OBJDUMP]"
 
 set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -i"]
 
-set cpus_expected "(a29k|alliant|alpha|arc|arm|convex|d10v|d30v|h8|hppa|i386|i860|i960|m32r|m68k|m88k|mips|mn10200|mn10300|ns32k|powerpc|pyramid|romp|rs6000|sh|sparc|tahoe|v850|vax|we32k|z8k|z8001|z8002)"
+set cpus_expected "(a29k|alliant|alpha|arc|arm|convex|d10v|d30v|fr30|h8|hppa|i386|i860|i960|m32r|m68k|m88k|MCore|mips|mn10200|mn10300|ns32k|powerpc|pyramid|romp|rs6000|sh|sparc|tahoe|v850|vax|we32k|z8k|z8001|z8002)"
 
 # Make sure the target CPU shows up in the list.
 if ![regexp $cpus_expected $target_cpu] {

diff --git a/binutils/testsuite/binutils-all/readelf.r b/binutils/testsuite/binutils-all/readelf.r
index 4bea721..1349659 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 0x.* contains 1 entries:
   Offset    Info  Type            Symbol's Value  Symbol's Name.*
-  00000004  00.* R_.*           00000000  external_symbol.*
+  00000004  00.* R_.*00000000  external_symbol.*