* 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.

15 files changed, 49 insertions, 21 deletions

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index b8cee24b..9615e57 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-29  Nick Clifton  <nickc@redhat.com>
+
+	* binutils-all/objdump.W: Do not assume that high and low PC
+	addresses will have been computed.
+
 2008-10-06  Tom Tromey  <tromey@redhat.com>
 
 	* binutils-all/objdump.W: Update.
diff --git a/binutils/testsuite/binutils-all/objdump.W b/binutils/testsuite/binutils-all/objdump.W
index 7617470..1c7e6a9 100644
--- a/binutils/testsuite/binutils-all/objdump.W
+++ b/binutils/testsuite/binutils-all/objdump.W
@@ -10,8 +10,8 @@ Contents of the .debug_info section:
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
     < c>   DW_AT_stmt_list   : 0x0	
-    <10>   DW_AT_high_pc     : 0x8	
-    <14>   DW_AT_low_pc      : 0x4	
+    <10>   DW_AT_high_pc     : 0x.	
+    <14>   DW_AT_low_pc      : 0x.	
     <18>   DW_AT_name        : file1.txt	
     <22>   DW_AT_producer    : GNU C 3.3.3	
     <2e>   DW_AT_language    : 1	\(ANSI C\)
@@ -21,8 +21,8 @@ Contents of the .debug_info section:
     <32>   DW_AT_decl_line   : 2	
     <33>   DW_AT_name        : func_cu1	
     <3c>   DW_AT_type        : <0x4a>	
-    <40>   DW_AT_low_pc      : 0x4	
-    <44>   DW_AT_high_pc     : 0x8	
+    <40>   DW_AT_low_pc      : 0x.	
+    <44>   DW_AT_high_pc     : 0x.	
     <48>   DW_AT_frame_base  : 1 byte block: 55 	\(DW_OP_reg5\)
  <1><4a>: Abbrev Number: 3 \(DW_TAG_base_type\)
     <4b>   DW_AT_name        : int	
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>
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 7b5f5b1..0fb021f 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-29  Nick Clifton  <nickc@redhat.com>
+
+	* 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.
+
 2009-01-27  Hans-Peter Nilsson  <hp@axis.com>
 
 	* ld-cris/tls-tbss64.s, ld-cris/tls-e-80.d: New test.
diff --git a/ld/testsuite/ld-elf/group8a.d b/ld/testsuite/ld-elf/group8a.d
index 1efd6f3..b557151 100644
--- a/ld/testsuite/ld-elf/group8a.d
+++ b/ld/testsuite/ld-elf/group8a.d
@@ -1,7 +1,7 @@
 #source: group8.s
 #ld: -r --gc-sections --entry foo
 #readelf: -g --wide
-#notarget: ia64-*-*
+#notarget: ia64-*-* mep-*-*
 
 COMDAT group section \[[ 0-9]+\] `.group' \[foo\] contains 1 sections:
    \[Index\]    Name
diff --git a/ld/testsuite/ld-elf/group8b.d b/ld/testsuite/ld-elf/group8b.d
index 95ea439..0a78173 100644
--- a/ld/testsuite/ld-elf/group8b.d
+++ b/ld/testsuite/ld-elf/group8b.d
@@ -1,7 +1,7 @@
 #source: group8.s
 #ld: -r --gc-sections --entry bar
 #readelf: -g --wide
-#notarget: ia64-*-*
+#notarget: ia64-*-* mep-*-*
 
 COMDAT group section \[[ 0-9]+\] `.group' \[bar\] contains 1 sections:
    \[Index\]    Name
diff --git a/ld/testsuite/ld-elf/group9a.d b/ld/testsuite/ld-elf/group9a.d
index 7f85100..a20e24f 100644
--- a/ld/testsuite/ld-elf/group9a.d
+++ b/ld/testsuite/ld-elf/group9a.d
@@ -1,7 +1,7 @@
 #source: group9.s
 #ld: -r --gc-sections --entry foo
 #readelf: -g --wide
-#notarget: ia64-*-*
+#notarget: ia64-*-* mep-*-*
 
 COMDAT group section \[[ 0-9]+\] `.group' \[foo\] contains 2 sections:
    \[Index\]    Name
diff --git a/ld/testsuite/ld-elf/group9b.d b/ld/testsuite/ld-elf/group9b.d
index 82ca062..a28d670 100644
--- a/ld/testsuite/ld-elf/group9b.d
+++ b/ld/testsuite/ld-elf/group9b.d
@@ -1,7 +1,7 @@
 #source: group9.s
 #ld: -r --gc-sections --entry bar
 #readelf: -g --wide
-#notarget: ia64-*-*
+#notarget: ia64-*-* mep-*-*
 
 COMDAT group section \[[ 0-9]+\] `.group' \[foo\] contains 2 sections:
    \[Index\]    Name
diff --git a/ld/testsuite/ld-elf/merge.d b/ld/testsuite/ld-elf/merge.d
index 83cb6d6..95e5d0e 100644
--- a/ld/testsuite/ld-elf/merge.d
+++ b/ld/testsuite/ld-elf/merge.d
@@ -4,7 +4,7 @@
 #xfail: "arc-*-*" "avr-*-*" "bfin-*-*" "cris*-*-*" "crx-*-*" "d10v-*-*" "d30v-*-*"
 #xfail: "dlx-*-*" "fr30-*-*" "frv-*-*" "hppa*-*-*" "h8300-*-*" "score-*-*"
 #xfail: "i370-*-*" "i860-*-*" "i960-*-*" "ip2k-*-*" "iq2000-*-*" "lm32-*-*"
-#xfail: "mcore-*-*" "mn102*-*-*" "mips*-*-*" "ms1-*-*" "msp430-*-*"
+#xfail: "mcore-*-*" "mn102*-*-*" "mips*-*-*" "ms1-*-*" "msp430-*-*" "mep-*-*"
 #xfail: "or32-*-*" "pj-*-*" "sparc*-*-*" "vax-*-*" "xstormy16-*-*" "xtensa*-*-*"
 
 .*:     file format .*elf.*
diff --git a/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp
index 652ee6f..0641bce 100644
--- a/ld/testsuite/ld-srec/srec.exp
+++ b/ld/testsuite/ld-srec/srec.exp
@@ -1,6 +1,6 @@
 # Test linking directly to S-records.
 # By Ian Lance Taylor, Cygnus Support.
-#   Copyright 1999, 2000, 2001, 2002, 2003, 2006, 2007
+#   Copyright 1999, 2000, 2001, 2002, 2003, 2006, 2007, 2009
 #   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
@@ -383,7 +383,8 @@ setup_xfail "alpha*-*-elf*" "alpha*-*-linux-*" "alpha*-*-gnu*"
 setup_xfail "alpha*-*-netbsd*"
 
 # The S-record linker hasn't any hope of coping with HPPA relocs.
-setup_xfail "hppa*-*-*"
+# Or MeP complex relocs.
+setup_xfail "hppa*-*-*" "mep-*-*"
 
 # The S-record linker doesn't handle IA64 Elf relaxation.
 setup_xfail "ia64-*-*"
@@ -420,7 +421,7 @@ setup_xfail "thumb-*-*"
 setup_xfail "v850*-*-elf"
 setup_xfail "alpha*-*-elf*" "alpha*-*-linux-*" "alpha*-*-gnu*"
 setup_xfail "alpha*-*-netbsd*"
-setup_xfail "hppa*-*-*"
+setup_xfail "hppa*-*-*" "mep-*-*"
 setup_xfail "ia64-*-*"
 setup_xfail "*-*-cygwin*" "*-*-mingw*" "*-*-pe*" "*-*-winnt*"
 setup_xfail "score-*-*"
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index b4f21fd..15ed41d 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -1,6 +1,6 @@
 # Support routines for LD testsuite.
 #   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#    2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+#    2004, 2005, 2006, 2007, 2009  Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -1591,6 +1591,7 @@ proc check_gc_sections_available { } {
 	# Some targets don't support gc-sections despite whatever's
 	# advertised by ld's options.
 	if { [istarget alpha*-*-*]
+	     || [istarget mep-*-*]
 	     || [istarget ia64-*-*] } {
 	    set gc_sections_available_saved 0
 	    return 0