* gas/mips/ld.s: Remove "l.d", "s.d" and "sd" instructions.

	* gas/mips/ld.d: Adjust accordingly.
	* gas/mips/ld-ilocks.d: Likewise

4 files changed, 6 insertions, 136 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index cb5ca892c92..1f467051716 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2010-10-24  Maciej W. Rozycki  <macro@linux-mips.org>
 
+	* gas/mips/ld.s: Remove "l.d", "s.d" and "sd" instructions.
+	* gas/mips/ld.d: Adjust accordingly.
+	* gas/mips/ld-ilocks.d: Likewise
+
+2010-10-24  Maciej W. Rozycki  <macro@linux-mips.org>
+
 	* gas/mips/ld.s: Remove ".set mips1".
 	* gas/mips/ld.d: Remove "-march=r4000" and "-mmips:4000" from
 	gas/objdump options.
diff --git a/gas/testsuite/gas/mips/ld-ilocks.d b/gas/testsuite/gas/mips/ld-ilocks.d
index 8dfd1e5ddf9..dd9aaf6a8b8 100644
--- a/gas/testsuite/gas/mips/ld-ilocks.d
+++ b/gas/testsuite/gas/mips/ld-ilocks.d
@@ -563,59 +563,4 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
 [0-9a-f]+ <[^>]*> lw	a1,-(23127|19031)\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],0\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],4\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],1\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],5\(zero\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],0\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],4\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],1\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],5\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> nop
-[0-9a-f]+ <[^>]*> swc1	\$f[45],0\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],4\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],1\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],5\(zero\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],0\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],4\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],1\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],5\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> sw	a0,0\(zero\)
-[0-9a-f]+ <[^>]*> sw	a1,4\(zero\)
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/ld.d b/gas/testsuite/gas/mips/ld.d
index 929a1d4e2ba..6a2b534c188 100644
--- a/gas/testsuite/gas/mips/ld.d
+++ b/gas/testsuite/gas/mips/ld.d
@@ -571,59 +571,4 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
 [0-9a-f]+ <[^>]*> lw	a1,-(23127|19031)\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],0\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],4\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],1\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],5\(zero\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],0\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],4\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],1\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],5\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> nop
-[0-9a-f]+ <[^>]*> swc1	\$f[45],0\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],4\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],1\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],5\(zero\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],0\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],4\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],1\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],5\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> sw	a0,0\(zero\)
-[0-9a-f]+ <[^>]*> sw	a1,4\(zero\)
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/ld.s b/gas/testsuite/gas/mips/ld.s
index a6ceffbc506..0f8ae9bca25 100644
--- a/gas/testsuite/gas/mips/ld.s
+++ b/gas/testsuite/gas/mips/ld.s
@@ -113,32 +113,6 @@ data_label:
 	ld	$4,big_local_common+0x1a5a5($5)
 	ld	$4,small_local_common+0x1a5a5($5)
 
-# l.d and s.d are sort of like ld.
-	l.d	$f4,0
-	l.d	$f4,1
-	l.d	$f4,0x8000
-	l.d	$f4,-0x8000
-	l.d	$f4,0($5)
-	l.d	$f4,1($5)
-	l.d	$f4,0x8000($5)
-	l.d	$f4,-0x8000($5)
-	l.d	$f4,small_external_common+0x1a5a5($5)
-	# Little endian will insert a nop here.
-	# We put it in explicitly so that big and little endian are similar.
-	nop
-	s.d	$f4,0
-	s.d	$f4,1
-	s.d	$f4,0x8000
-	s.d	$f4,-0x8000
-	s.d	$f4,0($5)
-	s.d	$f4,1($5)
-	s.d	$f4,0x8000($5)
-	s.d	$f4,-0x8000($5)
-	s.d	$f4,big_external_common+0x1a5a5($5)
-
-# sd is handled like ld.  Sanity check it.
-	sd	$4,0
-
 # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
 	.align	2
 	.space	8