diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index e4f599e51d6..1aa100c9047 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-23 Chris Demetriou <cgd@broadcom.com>
+
+ * ld-mips-elf/reloc-3-r.d: Remove, as part of MIPS -membedded-pic
+ removal.
+ * ld-mips-elf/reloc-3-srec.d: Likewise.
+ * ld-mips-elf/reloc-3.ld: Likewise.
+ * ld-mips-elf/reloc-3a.s: Likewise.
+ * ld-mips-elf/reloc-3b.s: Likewise.
+ * ld-mips-elf/mips-elf.exp: Don't run now-removed tests.
+
2004-04-22 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* ld-sh/tlsbin-1.d: Update
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 50cb8114d91..36fae9b6421 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -74,7 +74,3 @@ if $has_newabi {
}
}
run_dump_test "reloc-2"
-if $embedded_elf {
- run_dump_test "reloc-3-r"
- run_dump_test "reloc-3-srec"
-}
diff --git a/ld/testsuite/ld-mips-elf/reloc-3-r.d b/ld/testsuite/ld-mips-elf/reloc-3-r.d
deleted file mode 100644
index 9624e6e16e9..00000000000
--- a/ld/testsuite/ld-mips-elf/reloc-3-r.d
+++ /dev/null
@@ -1,83 +0,0 @@
-#source: reloc-3a.s -mabi=32 -membedded-pic
-#source: reloc-3b.s -mabi=32 -membedded-pic
-#ld: -r
-#objdump: -dr
-
-.*: file format .*
-
-Disassembly of section \.text:
-
-.* <.*>:
-#
-# Relocations against lda
-#
-.*: 3c04ffff lui a0,0xffff
- .*: R_MIPS_GNU_REL_HI16 \.text2
-.*: 24847ffc addiu a0,a0,32764
- .*: R_MIPS_GNU_REL_LO16 \.text2
-.*: 3c040000 lui a0,0x0
- .*: R_MIPS_GNU_REL_HI16 \.text2
-.*: 24848014 addiu a0,a0,-32748
- .*: R_MIPS_GNU_REL_LO16 \.text2
-.*: 3c040000 lui a0,0x0
- .*: R_MIPS_GNU_REL_HI16 \.text2
-.*: 2484001c addiu a0,a0,28
- .*: R_MIPS_GNU_REL_LO16 \.text2
-.*: 3c040001 lui a0,0x1
- .*: R_MIPS_GNU_REL_HI16 \.text2
-.*: 24848014 addiu a0,a0,-32748
- .*: R_MIPS_GNU_REL_LO16 \.text2
-.*: 3c040001 lui a0,0x1
- .*: R_MIPS_GNU_REL_HI16 \.text2
-.*: 2484803c addiu a0,a0,-32708
- .*: R_MIPS_GNU_REL_LO16 \.text2
- \.\.\.
-
-.* <.*>:
-#
-# Relocations against gd
-#
-.*: 3c04ffff lui a0,0xffff
- .*: R_MIPS_GNU_REL_HI16 gd
-.*: 24847ff4 addiu a0,a0,32756
- .*: R_MIPS_GNU_REL_LO16 gd
-.*: 3c040000 lui a0,0x0
- .*: R_MIPS_GNU_REL_HI16 gd
-.*: 2484800c addiu a0,a0,-32756
- .*: R_MIPS_GNU_REL_LO16 gd
-.*: 3c040000 lui a0,0x0
- .*: R_MIPS_GNU_REL_HI16 gd
-.*: 24840014 addiu a0,a0,20
- .*: R_MIPS_GNU_REL_LO16 gd
-.*: 3c040001 lui a0,0x1
- .*: R_MIPS_GNU_REL_HI16 gd
-.*: 2484800c addiu a0,a0,-32756
- .*: R_MIPS_GNU_REL_LO16 gd
-.*: 3c040001 lui a0,0x1
- .*: R_MIPS_GNU_REL_HI16 gd
-.*: 24848034 addiu a0,a0,-32716
- .*: R_MIPS_GNU_REL_LO16 gd
-#
-# Relocations against ldb
-#
-.*: 3c040000 lui a0,0x0
- .*: R_MIPS_GNU_REL_HI16 \.text2
-.*: 2484802c addiu a0,a0,-32724
- .*: R_MIPS_GNU_REL_LO16 \.text2
-.*: 3c040000 lui a0,0x0
- .*: R_MIPS_GNU_REL_HI16 \.text2
-.*: 24848044 addiu a0,a0,-32700
- .*: R_MIPS_GNU_REL_LO16 \.text2
-.*: 3c040000 lui a0,0x0
- .*: R_MIPS_GNU_REL_HI16 \.text2
-.*: 2484004c addiu a0,a0,76
- .*: R_MIPS_GNU_REL_LO16 \.text2
-.*: 3c040001 lui a0,0x1
- .*: R_MIPS_GNU_REL_HI16 \.text2
-.*: 24848044 addiu a0,a0,-32700
- .*: R_MIPS_GNU_REL_LO16 \.text2
-.*: 3c040001 lui a0,0x1
- .*: R_MIPS_GNU_REL_HI16 \.text2
-.*: 2484806c addiu a0,a0,-32660
- .*: R_MIPS_GNU_REL_LO16 \.text2
- \.\.\.
diff --git a/ld/testsuite/ld-mips-elf/reloc-3-srec.d b/ld/testsuite/ld-mips-elf/reloc-3-srec.d
deleted file mode 100644
index a4a7d24f755..00000000000
--- a/ld/testsuite/ld-mips-elf/reloc-3-srec.d
+++ /dev/null
@@ -1,54 +0,0 @@
-#source: reloc-3a.s -mabi=32 -membedded-pic -EB
-#source: reloc-3b.s -mabi=32 -membedded-pic -EB
-#ld: --oformat=srec -Treloc-3.ld
-#objdump: -D -mmips:4000 --endian=big
-
-.*: file format .*
-
-Disassembly of section .*:
-
-.* <.*>:
-# .text2 - tstarta = 0x108000
-# .text2 - tstartb = 0x098010
-#
-# Relocations against lda
-#
-.*: 3c040010 lui a0,0x10
-.*: 2484fff8 addiu a0,a0,-8
-.*: 3c040010 lui a0,0x10
-.*: 24840008 addiu a0,a0,8
-.*: 3c040011 lui a0,0x11
-.*: 24848008 addiu a0,a0,-32760
-.*: 3c040011 lui a0,0x11
-.*: 2484fff8 addiu a0,a0,-8
-.*: 3c040011 lui a0,0x11
-.*: 24840018 addiu a0,a0,24
- \.\.\.
-#
-# Relocations against gd
-#
-.*: 3c04000f lui a0,0xf
-.*: 24840004 addiu a0,a0,4
-.*: 3c04000f lui a0,0xf
-.*: 24840014 addiu a0,a0,20
-.*: 3c040010 lui a0,0x10
-.*: 24848014 addiu a0,a0,-32748
-.*: 3c040010 lui a0,0x10
-.*: 24840004 addiu a0,a0,4
-.*: 3c040010 lui a0,0x10
-.*: 24840024 addiu a0,a0,36
-#
-# Relocations against ldb
-#
-.*: 3c04000f lui a0,0xf
-.*: 24840010 addiu a0,a0,16
-.*: 3c04000f lui a0,0xf
-.*: 24840020 addiu a0,a0,32
-.*: 3c040010 lui a0,0x10
-.*: 24848020 addiu a0,a0,-32736
-.*: 3c040010 lui a0,0x10
-.*: 24840010 addiu a0,a0,16
-.*: 3c040010 lui a0,0x10
-.*: 24840030 addiu a0,a0,48
- \.\.\.
-#pass
diff --git a/ld/testsuite/ld-mips-elf/reloc-3.ld b/ld/testsuite/ld-mips-elf/reloc-3.ld
deleted file mode 100644
index a918bf9b3c6..00000000000
--- a/ld/testsuite/ld-mips-elf/reloc-3.ld
+++ /dev/null
@@ -1,8 +0,0 @@
-SECTIONS
-{
- . = 0x208000;
- .text : { *(.text) }
- . = 0x310000;
- .text2 : { *(.text2) }
- /DISCARD/ : { *(*) }
-}
diff --git a/ld/testsuite/ld-mips-elf/reloc-3a.s b/ld/testsuite/ld-mips-elf/reloc-3a.s
deleted file mode 100644
index f0cdabd0f47..00000000000
--- a/ld/testsuite/ld-mips-elf/reloc-3a.s
+++ /dev/null
@@ -1,38 +0,0 @@
- .globl _start
- .globl gd
- .ent tstarta
-tstarta:
-_start:
- la $4,lda-tstarta-0x8010
- # (.text2+8-0x8010) - tstarta [+ (tstarta+0x4)]
- # relocation: .text2 - 0x8004
- # final value: .text2 - tstarta - 0x8008
-
- la $4,lda-tstarta-0x8000
- # (.text2+8-0x8000) - tstarta [+ (tstarta+0xc)]
- # relocation: .text2 - 0x7fec
- # final value: .text2 - tstarta - 0x7ff8
-
- la $4,lda-tstarta
- # (.text2+8) - tstarta [+ (tstarta+0x14)]
- # relocation: .text2 + 0x1c
- # final value: .text2 - tstarta + 0x8
-
- la $4,lda-tstarta+0x7ff0
- # (.text2+8+0x7ff0) - tstarta [+ (tstarta+0x1c)]
- # relocation: .text2 + 0x8014
- # final value: .text2 - tstarta + 0x7ff8
-
- la $4,lda-tstarta+0x8010 # (.text2+8)-(tstarta+0x8010)+0x24
- # (.text2+8+0x8010) - tstarta [+ (tstarta+0x24)]
- # relocation: .text2 + 0x803c
- # final value: .text2 - tstarta + 0x8018
-
- .end tstarta
-
- .org 0xfff0
- .section .text2
- .word 1
-gd: .word 2
-lda: .word 3
- .word 4
diff --git a/ld/testsuite/ld-mips-elf/reloc-3b.s b/ld/testsuite/ld-mips-elf/reloc-3b.s
deleted file mode 100644
index 8d50334e1c7..00000000000
--- a/ld/testsuite/ld-mips-elf/reloc-3b.s
+++ /dev/null
@@ -1,58 +0,0 @@
- .globl _start
- .globl gd
- .ent tstartb
-tstartb:
- la $4,gd-tstartb-0x8010
- # (gd-0x8010) - tstartb [+ (tstartb+0x4)]
- # relocation: gd - 0x800c
- # final value: gd - tstartb - 0x8010
-
- la $4,gd-tstartb-0x8000
- # (gd-0x8000) - tstartb [+ (tstartb+0xc)]
- # relocation: gd - 0x7ff4
- # final value: gd - tstartb - 0x8000
-
- la $4,gd-tstartb
- # (gd) - tstartb [+ (tstartb+0x14)]
- # relocation: gd + 0x14
- # final value: gd - tstartb
-
- la $4,gd-tstartb+0x7ff0
- # (gd+0x7ff0) - tstartb [+ (tstartb+0x1c)]
- # relocation: gd + 0x800c
- # final value: gd - tstartb + 0x7ff0
-
- la $4,gd-tstartb+0x8010
- # (gd+0x8010) - tstartb [+ (tstartb+0x24)]
- # relocation: gd + 0x8034
- # final value: gd - tstartb + 0x8010
-
- la $4,ldb-tstartb-0x8010
- # (.text2+0x10-0x8010) - tstartb [+ (tstartb+0x2c)]
- # relocation: .text2 - 0x7fd4
- # final value: .text2 - tstartb - 0x8000
-
- la $4,ldb-tstartb-0x8000
- # (.text2+0x10-0x8000) - tstartb [+ (tstartb+0x34)]
- # relocation: .text2 - 0x7fbc
- # final value: .text2 - tstartb - 0x7ff0
-
- la $4,ldb-tstartb
- # (.text2+0x10) - tstartb [+ (tstartb+0x3c)]
- # relocation: .text2 + 0x4c
- # final value: .text2 - tstartb + 0x10
-
- la $4,ldb-tstartb+0x7ff0
- # (.text2+0x10+0x7ff0) - tstartb [+ (tstartb+0x44)]
- # relocation: .text2 + 0x8044
- # final value: .text2 - tstartb + 0x8000
-
- la $4,ldb-tstartb+0x8010
- # (.text2+0x10+0x8010) - tstartb [+ (tstartb+0x4c)]
- # relocation: .text2 + 0x806c
- # final value: .text2 - tstartb + 0x8020
-
- .end tstartb
- .space 16
- .section .text2
-ldb: .word 5