* configure.tgt: Fix mep cpu case.

	testsuite/
	* gas/mep/allinsn.be.d: Renamed from allinsn.d.  Pass -EB.
	* gas/mep/allinsn.exp: branch1 is now bi-endian.
	* gas/mep/branch1.be.d: Renamed from branch1.d.  Pass -EB.
	* gas/mep/branch1.le.d: New file.
	* gas/mep/dj1.be.d: Renamed from dj1.d.  Pass -EB.
	* gas/mep/dj2.be.d: Renamed from dj2.d.  Pass -EB.

10 files changed, 61 insertions, 24 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3df889bd47..61886b46de 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-26  Doug Evans  <dje@sebabeach.org>
+
+	* configure.tgt: Fix mep cpu case.
+
 2010-02-26  Jie Zhang  <jie@codesourcery.com>
 
 	* config/tc-arm.c (do_t_strexd): Remove
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 0d24a7442e..55df0da8b9 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -54,7 +54,7 @@ case ${cpu} in
   m6811|m6812|m68hc12)	cpu_type=m68hc11 ;;
   m683??)		cpu_type=m68k ;;
   maxq)			cpu_type=maxq ;;
-  mep-*-elf)		cpu_type=mep endian=big ;;
+  mep)			cpu_type=mep endian=little ;;
   microblaze*)		cpu_type=microblaze ;;
   mips*el)		cpu_type=mips endian=little ;;
   mips*)		cpu_type=mips endian=big ;;
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c302471113..c07edc3070 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-26  Doug Evans  <dje@sebabeach.org>
+
+	* gas/mep/allinsn.be.d: Renamed from allinsn.d.  Pass -EB.
+	* gas/mep/allinsn.exp: branch1 is now bi-endian.
+	* gas/mep/branch1.be.d: Renamed from branch1.d.  Pass -EB.
+	* gas/mep/branch1.le.d: New file.
+	* gas/mep/dj1.be.d: Renamed from dj1.d.  Pass -EB.
+	* gas/mep/dj2.be.d: Renamed from dj2.d.  Pass -EB.
+
 2010-02-26  Jie Zhang  <jie@codesourcery.com>
 
 	* gas/arm/thumb32.s, gas/arm/thumb32.d: Add a new test
diff --git a/gas/testsuite/gas/mep/allinsn.d b/gas/testsuite/gas/mep/allinsn.be.d
index 3a1f62c306..6171608f8a 100644
--- a/gas/testsuite/gas/mep/allinsn.d
+++ b/gas/testsuite/gas/mep/allinsn.be.d
@@ -1,6 +1,7 @@
-#as:
+#as: -EB
 #objdump: -dr
-#name: allinsn
+#source: allinsn.s
+#name: allinsn.be
 
 .*: +file format .*
 
diff --git a/gas/testsuite/gas/mep/allinsn.exp b/gas/testsuite/gas/mep/allinsn.exp
index 259ed10b1a..76caf5edcc 100644
--- a/gas/testsuite/gas/mep/allinsn.exp
+++ b/gas/testsuite/gas/mep/allinsn.exp
@@ -1,9 +1,8 @@
 # MEP assembler testsuite. -*- Tcl -*-
 
 if [istarget mep*-*-*] {
-    foreach test {allinsn dj1 dj2} {
-	run_dump_test $test
+    foreach test {allinsn branch1 dj1 dj2} {
+	run_dump_test $test.be
 	run_dump_test $test.le
     }
-    run_dump_test branch1
 }
diff --git a/gas/testsuite/gas/mep/branch1.be.d b/gas/testsuite/gas/mep/branch1.be.d
new file mode 100644
index 0000000000..d1792815dc
--- /dev/null
+++ b/gas/testsuite/gas/mep/branch1.be.d
@@ -0,0 +1,18 @@
+#as: -EB
+#objdump: -dzr
+#source: branch1.s
+#name: branch1.be
+
+.*: *file format elf32-mep
+
+Disassembly of section \.text:
+
+.* <.*>:
+ *0:	00 00  *	nop
+ *2:	e4 51 00 00 *	beq \$4,\$5,.* <foo-0x8>
+[ 	]*2: *R_MEP_PCREL17A2	foo
+ *6:	00 00  *	nop
+ *8:	00 00  *	nop
+
+.* <foo>:
+ *a:	00 00  *	nop
diff --git a/gas/testsuite/gas/mep/branch1.d b/gas/testsuite/gas/mep/branch1.d
deleted file mode 100644
index 271b9184a5..0000000000
--- a/gas/testsuite/gas/mep/branch1.d
+++ /dev/null
@@ -1,14 +0,0 @@
-#objdump: -dzr
-
-.*: *file format elf32-mep
-
-Disassembly of section \.text:
-
-.* <.*>:
-  .*:	00 00  *	nop
-  .*:	e4 51 00 04 *	beq \$4,\$5,.* <foo>
-  .*:	00 00  *	nop
-  .*:	00 00  *	nop
-
-.* <foo>:
-  .*:	00 00  *	nop
diff --git a/gas/testsuite/gas/mep/branch1.le.d b/gas/testsuite/gas/mep/branch1.le.d
new file mode 100644
index 0000000000..e462b5ca90
--- /dev/null
+++ b/gas/testsuite/gas/mep/branch1.le.d
@@ -0,0 +1,18 @@
+#as: -EL
+#objdump: -dzr
+#source: branch1.s
+#name: branch1.le
+
+.*: *file format elf32-mep-little
+
+Disassembly of section \.text:
+
+.* <.*>:
+ *0:	00 00  *	nop
+ *2:	51 e4 00 00 *	beq \$4,\$5,.* <foo-0x8>
+[ 	]*2: *R_MEP_PCREL17A2	foo
+ *6:	00 00  *	nop
+ *8:	00 00  *	nop
+
+.* <foo>:
+ *a:	00 00  *	nop
diff --git a/gas/testsuite/gas/mep/dj1.d b/gas/testsuite/gas/mep/dj1.be.d
index c314d724ce..f7a2efe212 100644
--- a/gas/testsuite/gas/mep/dj1.d
+++ b/gas/testsuite/gas/mep/dj1.be.d
@@ -1,6 +1,7 @@
-#as:
+#as: -EB
 #objdump: -dr
-#name: dj1
+#source: dj1.s
+#name: dj1.be
 
 dump.o:     file format elf32-mep
 
diff --git a/gas/testsuite/gas/mep/dj2.d b/gas/testsuite/gas/mep/dj2.be.d
index 9634cf4c43..bf920dd737 100644
--- a/gas/testsuite/gas/mep/dj2.d
+++ b/gas/testsuite/gas/mep/dj2.be.d
@@ -1,6 +1,7 @@
-#as:
+#as: -EB
 #objdump: -dr
-#name: dj2
+#source: dj2.s
+#name: dj2.be
 
 .*: +file format .*