* config/tc-mep.h (DIFF_EXPR_OK): Do not define.

        * gas/all/gas.exp: Expect forward test to fail for MeP.
        Expect relax test to fail for MeP.
        * gas/mep/relocs.d: Update expected disassembly.

        * lib/ld-lib.exp (check_gc_sections_available): Add MeP to list of
        targets which do not support garbage collection.
        * ld-srec/srec.exp (run_srec_test): Expect tests to fail for MeP.
        * ld-elf/group8a.d: Likewise.
        * ld-elf/group8b.d: Likewise.
        * ld-elf/group9a.d: Likewise.
        * ld-elf/group9b.d: Likewise.

        * binutils-all/objdump.W: Do not assume that high and low PC
        addresses will have been computed.

5 files changed, 19 insertions, 8 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d4e2a40..200b9e7 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-29  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-mep.h (DIFF_EXPR_OK): Do not define.
+
 2009-01-29  Nathan Sidwell  <nathan@codesourcery.com>
 	    Catherine Moore <clm@codesourcery.com?
 
diff --git a/gas/config/tc-mep.h b/gas/config/tc-mep.h
index de68d71..505f53a 100644
--- a/gas/config/tc-mep.h
+++ b/gas/config/tc-mep.h
@@ -1,5 +1,5 @@
 /* tc-mep.h -- Header file for tc-mep.c.
-   Copyright (C) 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2005, 2007, 2009 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -39,8 +39,7 @@
 /* Permit temporary numeric labels. */
 #define LOCAL_LABELS_FB 1
 
-/* .-foo gets turned into PC relative relocs.  */
-#define DIFF_EXPR_OK
+/* Do not define DIFF_EXPR_OK - the MeP does not have a 32-bit PC-relative reloc.  */
 
 /* We don't need to handle .word strangely.  */
 #define WORKING_DOT_WORD
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index bf1fd94..d3d84d9 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-29  Nick Clifton  <nickc@redhat.com>
+
+	* gas/all/gas.exp: Expect forward test to fail for MeP.
+	Expect relax test to fail for MeP.
+	* gas/mep/relocs.d: Update expected disassembly.
+
 2009-01-27  Nick Clifton  <nickc@redhat.com>
 
 	* gas/arm/attr-cpu-directive.d: Only run test for EABI targets.
diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index 87908fb..32ca5b8 100644
--- a/gas/testsuite/gas/all/gas.exp
+++ b/gas/testsuite/gas/all/gas.exp
@@ -65,12 +65,13 @@ gas_test_error "assign-bad.s" "" "== assignment for symbol already set"
 # .equ works differently on some targets.
 # linkrelax-ing prevents most forward references from working.
 case $target_triplet in {
+    { *c54x*-*-* } { }
     { cr16*-*-* } { }
     { crx*-*-* } { }
     { h8300*-*-* } { }
     { hppa*-*-* } { }
+    { mep-*-* } { }
     { mn10\[23\]00*-*-* } { }
-    { *c54x*-*-* } { }
     default {
 	# Some targets don't manage to resolve BFD_RELOC_8 for constants.
 	setup_xfail "alpha*-*-*" "avr-*-*" "*c30*-*-*" "*c4x*-*-*" \
@@ -309,7 +310,8 @@ run_dump_test sleb128
 
 # .byte is 32 bits on tic4x, and .p2align isn't supported on tic54x
 # .space is different on hppa*-hpux.
-if { ![istarget "tic4x*-*-*"] && ![istarget "tic54x*-*-*"] && ![istarget "hppa*-*-hpux*"] } {
+# MeP put bytes into packets.
+if { ![istarget "tic4x*-*-*"] && ![istarget "tic54x*-*-*"] && ![istarget "hppa*-*-hpux*"] && ![istarget "mep*-*-*"] } {
     run_dump_test relax
 }
 
diff --git a/gas/testsuite/gas/mep/relocs.d b/gas/testsuite/gas/mep/relocs.d
index 406e589..7777579 100644
--- a/gas/testsuite/gas/mep/relocs.d
+++ b/gas/testsuite/gas/mep/relocs.d
@@ -55,8 +55,8 @@ Disassembly of section .text:
     102e:	00 00       	nop
     1030:	00 00       	nop
     1032:	c5 3c 10 12 	lb \$5,4114\(\$3\)
-    1036:	de e9 ff ff 	bsr 1012 <&:s3:foo:s3:bar>
-    103a:	e5 09 ff ec 	repeat \$5,1012 <&:s3:foo:s3:bar>
+    1036:	de e9 ff ff 	bsr 1012 <foo>
+    103a:	e5 09 ff ec 	repeat \$5,1012 <foo>
     103e:	00 00       	nop
     1040:	00 00       	nop
     1042:	c5 3c ef ee 	lb \$5,-4114\(\$3\)
@@ -79,7 +79,7 @@ Disassembly of section .text:
     1082:	d8 28 00 00 	jmp 4 <__assert_based_size\+0x3>
     1086:	d8 48 00 00 	jmp 8 <\^:s3:foo:s3:bar>
     108a:	d8 d8 00 10 	jmp 101a <|:s3:foo:s3:bar>
-    108e:	d8 98 00 10 	jmp 1012 <&:s3:foo:s3:bar>
+    108e:	d8 98 00 10 	jmp 1012 <foo>
     1092:	d8 08 00 00 	jmp 0 <<<:==:s3:foo:s3:bar:#0+05>
     1096:	d9 08 00 00 	jmp 20 <<<:&&:s3:foo:s3:bar:#0+05>
     109a:	d9 08 00 00 	jmp 20 <<<:&&:s3:foo:s3:bar:#0+05>