From c4990c4b1f7d158946abcb4afae9740471d176bb Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Thu, 23 Sep 2010 12:15:55 +0000
Subject: [PATCH] 	* gas/all/gas.exp: Update "forward" and "redef3"
 xfails. 	* gas/m68k/all.exp: Don't xfail pcrel on uclinux. 	*
 gas/sh/arch/arch.exp: Don't pass dashes to send_log.

---
 gas/testsuite/ChangeLog            |  6 ++++++
 gas/testsuite/gas/all/gas.exp      | 12 +++++++-----
 gas/testsuite/gas/m68k/all.exp     |  2 +-
 gas/testsuite/gas/sh/arch/arch.exp |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 0f4399a5cff..8ee3ca77bb2 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-23  Alan Modra  <amodra@gmail.com>
+
+	* gas/all/gas.exp: Update "forward" and "redef3" xfails.
+	* gas/m68k/all.exp: Don't xfail pcrel on uclinux.
+	* gas/sh/arch/arch.exp: Don't pass dashes to send_log.
+
 2010-09-23  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* gas/mips/jal.d: Remove duplicate pattern.
diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index fc1517ca0bf..0651bb2efcf 100644
--- a/gas/testsuite/gas/all/gas.exp
+++ b/gas/testsuite/gas/all/gas.exp
@@ -79,7 +79,7 @@ case $target_triplet in {
     { mn10\[23\]00*-*-* } { }
     default {
 	# Some targets don't manage to resolve BFD_RELOC_8 for constants.
-	setup_xfail "alpha*-*-*" "avr-*-*" "*c30*-*-*" "*c4x*-*-*" \
+	setup_xfail "alpha*-*-*" "*c30*-*-*" "*c4x*-*-*" \
 	    "d\[13\]0v*-*-*" "i860-*-*" "mips*-*-*" "msp430-*-*" \
 	    "pdp11-*-*" "sparc*-*-*" "xtensa*-*-*"
 	run_dump_test forward
@@ -114,10 +114,12 @@ case $target_triplet in {
 	    "*arm*-*-pe" "m68hc*-*-*" \
 	    "rx-*-*" "vax*-*-*" "z8k-*-*"
 	run_dump_test redef2
-	setup_xfail "*-*-aix*" "*-*-coff" "*-*-cygwin" "*-*-mingw*" "*-*-pe*" \
-	    "bfin-*-*" "hppa*-*-hpux*" \
-	    "m68hc*-*-*" "or32-*-*" \
-	    "rx-*-*" "vax*-*-*" "z8k-*-*"
+	setup_xfail "*-*-aix*" "bfin-*-*" "hppa*-*-hpux*" \
+	    "i\[3-7\]86-*-*coff" "i\[3-7\]86-*-*pe" "i\[3-7\]86-*-go32*" \
+	    "i\[3-7\]86-*-cygwin*" "i\[3-7\]86-*-mingw*" \
+	    "x86_64-*-*coff" "x86_64-*-*pe" \
+	    "x86_64-*-cygwin*" "x86_64-*-mingw*" \
+	    "m68hc*-*-*" "or32-*-*" "rx-*-*" "vax*-*-*" "z8k-*-*"
 	run_dump_test redef3
 	gas_test_error "redef4.s" "" ".set for symbol already used as label"
 	gas_test_error "redef5.s" "" ".set for symbol already defined through .comm"
diff --git a/gas/testsuite/gas/m68k/all.exp b/gas/testsuite/gas/m68k/all.exp
index 53fa62c3a84..443fdb62b42 100644
--- a/gas/testsuite/gas/m68k/all.exp
+++ b/gas/testsuite/gas/m68k/all.exp
@@ -27,7 +27,7 @@ if { [istarget m68*-*-*] || [istarget fido*-*-*] } then {
 
     # Reloc types etc. need changing for aout and coff to pass.
     setup_xfail "*-*"
-    clear_xfail "*-*-*elf*" "*-*-sysv4*" "*-*-rtems" "*-*-*gnu*" "*-*-psos*"
+    clear_xfail "*-*-*elf*" "*-*-sysv4*" "*-*-rtems*" "*-*-*linux*" "*-*-*gnu*" "*-*-psos*"
     run_dump_test pcrel
 
     # Since fido is basically CPU32, it does not support those
diff --git a/gas/testsuite/gas/sh/arch/arch.exp b/gas/testsuite/gas/sh/arch/arch.exp
index 0139be6ac1a..9ae992a676e 100644
--- a/gas/testsuite/gas/sh/arch/arch.exp
+++ b/gas/testsuite/gas/sh/arch/arch.exp
@@ -224,7 +224,7 @@ set insncount 0
 # Pull the architecture inheritance macros out of sh-opc.h
 # Pull all the insns out of the sh-opc.h file.
 send_log "Reading sh-opc.h\n"
-send_log "--------------------------------------------------------\n"
+send_log "========================================================\n"
 spawn -noecho cat "$srcdir/../../opcodes/sh-opc.h"   ;# -open doesn't seem to be reliable
 expect {
     -re {#define\s+arch_([^ ]*)_up\s*\(([^)]*)\)} {
-- 
2.30.2