diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d b/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d
deleted file mode 100644
index 8279d6f5d0c..00000000000
--- a/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# name: attributes for -mfpu=arm7500fe
-# source: blank.s
-# as: -mfpu=arm7500fe
-# readelf: -A
-# This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
-
-Attribute Section: aeabi
-File Attributes
-  Tag_ARM_ISA_use: Yes
-  Tag_THUMB_ISA_use: Thumb-1
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpa.d b/gas/testsuite/gas/arm/attr-mfpu-fpa.d
deleted file mode 100644
index 498d46a2b15..00000000000
--- a/gas/testsuite/gas/arm/attr-mfpu-fpa.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# name: attributes for -mfpu=fpa
-# source: blank.s
-# as: -mfpu=fpa
-# readelf: -A
-# This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
-
-Attribute Section: aeabi
-File Attributes
-  Tag_ARM_ISA_use: Yes
-  Tag_THUMB_ISA_use: Thumb-1
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpa10.d b/gas/testsuite/gas/arm/attr-mfpu-fpa10.d
deleted file mode 100644
index 73b25f0ea12..00000000000
--- a/gas/testsuite/gas/arm/attr-mfpu-fpa10.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# name: attributes for -mfpu=fpa10
-# source: blank.s
-# as: -mfpu=fpa10
-# readelf: -A
-# This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
-
-Attribute Section: aeabi
-File Attributes
-  Tag_ARM_ISA_use: Yes
-  Tag_THUMB_ISA_use: Thumb-1
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpa11.d b/gas/testsuite/gas/arm/attr-mfpu-fpa11.d
deleted file mode 100644
index 4c655f241bf..00000000000
--- a/gas/testsuite/gas/arm/attr-mfpu-fpa11.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# name: attributes for -mfpu=fpa11
-# source: blank.s
-# as: -mfpu=fpa11
-# readelf: -A
-# This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
-
-Attribute Section: aeabi
-File Attributes
-  Tag_ARM_ISA_use: Yes
-  Tag_THUMB_ISA_use: Thumb-1
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpe.d b/gas/testsuite/gas/arm/attr-mfpu-fpe.d
deleted file mode 100644
index 536acfb15f4..00000000000
--- a/gas/testsuite/gas/arm/attr-mfpu-fpe.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# name: attributes for -mfpu=fpe
-# source: blank.s
-# as: -mfpu=fpe
-# readelf: -A
-# This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
-
-Attribute Section: aeabi
-File Attributes
-  Tag_ARM_ISA_use: Yes
-  Tag_THUMB_ISA_use: Thumb-1
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpe2.d b/gas/testsuite/gas/arm/attr-mfpu-fpe2.d
deleted file mode 100644
index 29638ecf4ee..00000000000
--- a/gas/testsuite/gas/arm/attr-mfpu-fpe2.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# name: attributes for -mfpu=fpe2
-# source: blank.s
-# as: -mfpu=fpe2
-# readelf: -A
-# This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
-
-Attribute Section: aeabi
-File Attributes
-  Tag_ARM_ISA_use: Yes
-  Tag_THUMB_ISA_use: Thumb-1
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpe3.d b/gas/testsuite/gas/arm/attr-mfpu-fpe3.d
deleted file mode 100644
index 9f13b0fb416..00000000000
--- a/gas/testsuite/gas/arm/attr-mfpu-fpe3.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# name: attributes for -mfpu=fpe3
-# source: blank.s
-# as: -mfpu=fpe3
-# readelf: -A
-# This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
-
-Attribute Section: aeabi
-File Attributes
-  Tag_ARM_ISA_use: Yes
-  Tag_THUMB_ISA_use: Thumb-1
diff --git a/gas/testsuite/gas/arm/attr-mfpu-softfpa.d b/gas/testsuite/gas/arm/attr-mfpu-softfpa.d
deleted file mode 100644
index 8eb432b4bf9..00000000000
--- a/gas/testsuite/gas/arm/attr-mfpu-softfpa.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# name: attributes for -mfpu=softfpa
-# source: blank.s
-# as: -mfpu=softfpa
-# readelf: -A
-# This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
-
-Attribute Section: aeabi
-File Attributes
-  Tag_ARM_ISA_use: Yes
-  Tag_THUMB_ISA_use: Thumb-1
diff --git a/gas/testsuite/gas/arm/attr-override-mcpu.s b/gas/testsuite/gas/arm/attr-override-mcpu.s
index bc7a04c8d60..f924aa7fad5 100644
--- a/gas/testsuite/gas/arm/attr-override-mcpu.s
+++ b/gas/testsuite/gas/arm/attr-override-mcpu.s
@@ -1,2 +1,2 @@
 	.cpu arm7tdmi
-	.fpu softfpa
+	.fpu softvfp
diff --git a/gas/testsuite/gas/arm/float.d b/gas/testsuite/gas/arm/float.d
deleted file mode 100644
index 9faaf209158..00000000000
--- a/gas/testsuite/gas/arm/float.d
+++ /dev/null
@@ -1,131 +0,0 @@
-# name: Core floating point instructions
-# as: -mcpu=arm7tdmi -mfpu=fpa
-# objdump: -dr --prefix-addresses --show-raw-insn
-
-.*: +file format .*arm.*
-
-Disassembly of section .text:
-0+000 <[^>]+> ee088101 ?	mvfe	f0, f1
-0+004 <[^>]+> 0e08b105 ?	mvfeqe	f3, f5
-0+008 <[^>]+> 0e00c189 ?	mvfeqd	f4, #1\.0
-0+00c <[^>]+> ee00c107 ?	mvfs	f4, f7
-0+010 <[^>]+> ee008121 ?	mvfsp	f0, f1
-0+014 <[^>]+> ee00b1c4 ?	mvfdm	f3, f4
-0+018 <[^>]+> ee08f167 ?	mvfez	f7, f7
-0+01c <[^>]+> ee09010a ?	adfe	f0, f1, #2\.0
-0+020 <[^>]+> 0e0a110e ?	adfeqe	f1, f2, #0\.5
-0+024 <[^>]+> ee043145 ?	adfsm	f3, f4, f5
-0+028 <[^>]+> ee20018a ?	sufd	f0, f0, #2\.0
-0+02c <[^>]+> ee22110f ?	sufs	f1, f2, #10\.0
-0+030 <[^>]+> 1e2c3165 ?	sufneez	f3, f4, f5
-0+034 <[^>]+> ee311108 ?	rsfs	f1, f1, #0\.0
-0+038 <[^>]+> ee3031ad ?	rsfdp	f3, f0, #5\.0
-0+03c <[^>]+> de367180 ?	rsfled	f7, f6, f0
-0+040 <[^>]+> ee100180 ?	mufd	f0, f0, f0
-0+044 <[^>]+> ee1a116b ?	mufez	f1, f2, #3\.0
-0+048 <[^>]+> ee10010c ?	mufs	f0, f0, #4\.0
-0+04c <[^>]+> ee400189 ?	dvfd	f0, f0, #1\.0
-0+050 <[^>]+> ee49016f ?	dvfez	f0, f1, #10\.0
-0+054 <[^>]+> 4e443145 ?	dvfmism	f3, f4, f5
-0+058 <[^>]+> ee59010f ?	rdfe	f0, f1, #10\.0
-0+05c <[^>]+> ee573109 ?	rdfs	f3, f7, #1\.0
-0+060 <[^>]+> 3e5441a3 ?	rdfccdp	f4, f4, f3
-0+064 <[^>]+> ee620183 ?	powd	f0, f2, f3
-0+068 <[^>]+> ee63110f ?	pows	f1, f3, #10\.0
-0+06c <[^>]+> 2e6f4169 ?	powcsez	f4, f7, #1\.0
-0+070 <[^>]+> ee767107 ?	rpws	f7, f6, f7
-0+074 <[^>]+> 0e710182 ?	rpweqd	f0, f1, f2
-0+078 <[^>]+> ee7a2143 ?	rpwem	f2, f2, f3
-0+07c <[^>]+> ee82118b ?	rmfd	f1, f2, #3\.0
-0+080 <[^>]+> 6e843104 ?	rmfvss	f3, f4, f4
-0+084 <[^>]+> ee8f4120 ?	rmfep	f4, f7, f0
-0+088 <[^>]+> ee910102 ?	fmls	f0, f1, f2
-0+08c <[^>]+> 0e931105 ?	fmleqs	f1, f3, f5
-0+090 <[^>]+> 5e964160 ?	fmlplsz	f4, f6, f0
-0+094 <[^>]+> eea3110f ?	fdvs	f1, f3, #10\.0
-0+098 <[^>]+> eea10122 ?	fdvsp	f0, f1, f2
-0+09c <[^>]+> 2ea44144 ?	fdvcssm	f4, f4, f4
-0+0a0 <[^>]+> eeb11109 ?	frds	f1, f1, #1\.0
-0+0a4 <[^>]+> ceb12100 ?	frdgts	f2, f1, f0
-0+0a8 <[^>]+> ceb44165 ?	frdgtsz	f4, f4, f5
-0+0ac <[^>]+> eec10182 ?	pold	f0, f1, f2
-0+0b0 <[^>]+> eec6416b ?	polsz	f4, f6, #3\.0
-0+0b4 <[^>]+> 0ece5107 ?	poleqe	f5, f6, f7
-0+0b8 <[^>]+> ee108101 ?	mnfs	f0, f1
-0+0bc <[^>]+> ee10818b ?	mnfd	f0, #3\.0
-0+0c0 <[^>]+> ee18816c ?	mnfez	f0, #4\.0
-0+0c4 <[^>]+> 0e188165 ?	mnfeqez	f0, f5
-0+0c8 <[^>]+> ee108124 ?	mnfsp	f0, f4
-0+0cc <[^>]+> ee1091c7 ?	mnfdm	f1, f7
-0+0d0 <[^>]+> ee208181 ?	absd	f0, f1
-0+0d4 <[^>]+> ee20912b ?	abssp	f1, #3\.0
-0+0d8 <[^>]+> 0e28c105 ?	abseqe	f4, f5
-0+0dc <[^>]+> ee309102 ?	rnds	f1, f2
-0+0e0 <[^>]+> ee30b184 ?	rndd	f3, f4
-0+0e4 <[^>]+> 0e38e16c ?	rndeqez	f6, #4\.0
-0+0e8 <[^>]+> ee40d105 ?	sqts	f5, f5
-0+0ec <[^>]+> ee40e1a6 ?	sqtdp	f6, f6
-0+0f0 <[^>]+> 5e48f166 ?	sqtplez	f7, f6
-0+0f4 <[^>]+> ee50810f ?	logs	f0, #10\.0
-0+0f8 <[^>]+> ee58810f ?	loge	f0, #10\.0
-0+0fc <[^>]+> 1e5081e1 ?	lognedz	f0, f1
-0+100 <[^>]+> ee689102 ?	lgne	f1, f2
-0+104 <[^>]+> ee6091e3 ?	lgndz	f1, f3
-0+108 <[^>]+> 7e60b104 ?	lgnvcs	f3, f4
-0+10c <[^>]+> ee709103 ?	exps	f1, f3
-0+110 <[^>]+> ee78b14f ?	expem	f3, #10\.0
-0+114 <[^>]+> 5e70e187 ?	exppld	f6, f7
-0+118 <[^>]+> ee808181 ?	sind	f0, f1
-0+11c <[^>]+> ee809142 ?	sinsm	f1, f2
-0+120 <[^>]+> ce88c10d ?	singte	f4, #5\.0
-0+124 <[^>]+> ee909183 ?	cosd	f1, f3
-0+128 <[^>]+> ee98c145 ?	cosem	f4, f5
-0+12c <[^>]+> 1e90e1a1 ?	cosnedp	f6, f1
-0+130 <[^>]+> eea89105 ?	tane	f1, f5
-0+134 <[^>]+> eea0c167 ?	tansz	f4, f7
-0+138 <[^>]+> aea091ec ?	tangedz	f1, #4\.0
-0+13c <[^>]+> eeb8c105 ?	asne	f4, f5
-0+140 <[^>]+> eeb0e12e ?	asnsp	f6, #0\.5
-0+144 <[^>]+> 4eb0d1e5 ?	asnmidz	f5, f5
-0+148 <[^>]+> eec0d106 ?	acss	f5, f6
-0+14c <[^>]+> eec0e180 ?	acsd	f6, f0
-0+150 <[^>]+> 2ec8914e ?	acscsem	f1, #0\.5
-0+154 <[^>]+> eed88105 ?	atne	f0, f5
-0+158 <[^>]+> eed0916d ?	atnsz	f1, #5\.0
-0+15c <[^>]+> bed0b182 ?	atnltd	f3, f2
-0+160 <[^>]+> eee8d104 ?	urde	f5, f4
-0+164 <[^>]+> eef8e105 ?	nrme	f6, f5
-0+168 <[^>]+> 5ef0f1e5 ?	nrmpldz	f7, f5
-0+16c <[^>]+> ee008130 ?	fltsp	f0, r8
-0+170 <[^>]+> ee090110 ?	flte	f1, r0
-0+174 <[^>]+> 0e0571f0 ?	flteqdz	f5, r7
-0+178 <[^>]+> ee100111 ?	fix	r0, f1
-0+17c <[^>]+> ee101177 ?	fixz	r1, f7
-0+180 <[^>]+> 2e105155 ?	fixcsm	r5, f5
-0+184 <[^>]+> ee400110 ?	wfc	r0
-0+188 <[^>]+> ee201110 ?	wfs	r1
-0+18c <[^>]+> 0e302110 ?	rfseq	r2
-0+190 <[^>]+> ee504110 ?	rfc	r4
-0+194 <[^>]+> ee90f119 ?	cmf	f0, #1\.0
-0+198 <[^>]+> ee91f112 ?	cmf	f1, f2
-0+19c <[^>]+> 0e90f111 ?	cmfeq	f0, f1
-0+1a0 <[^>]+> eeb0f11b ?	cnf	f0, #3\.0
-0+1a4 <[^>]+> eeb1f11e ?	cnf	f1, #0\.5
-0+1a8 <[^>]+> 6eb3f114 ?	cnfvs	f3, f4
-0+1ac <[^>]+> eed0f111 ?	cmfe	f0, f1
-0+1b0 <[^>]+> 0ed1f112 ?	cmfeeq	f1, f2
-0+1b4 <[^>]+> 0ed3f11d ?	cmfeeq	f3, #5\.0
-0+1b8 <[^>]+> eef1f113 ?	cnfe	f1, f3
-0+1bc <[^>]+> 0ef3f114 ?	cnfeeq	f3, f4
-0+1c0 <[^>]+> 0ef4f117 ?	cnfeeq	f4, f7
-0+1c4 <[^>]+> eef4f11d ?	cnfe	f4, #5\.0
-0+1c8 <[^>]+> ed900200 ?	lfm	f0, 4, \[r0\]
-0+1cc <[^>]+> ed900200 ?	lfm	f0, 4, \[r0\]
-0+1d0 <[^>]+> ed911210 ?	lfm	f1, 4, \[r1, #64\].*
-0+1d4 <[^>]+> edae22ff ?	sfm	f2, 4, \[lr, #1020\]!.*
-0+1d8 <[^>]+> 0c68f2ff ?	sfmeq	f7, 3, \[r8\], #-1020.*
-0+1dc <[^>]+> eddf6200 ?	lfm	f6, 2, \[pc\]	@ .* <l\+.*>
-0+1e0 <[^>]+> eca8f203 ?	sfm	f7, 1, \[r8\], #12
-0+1e4 <[^>]+> 0d16520c ?	lfmeq	f5, 4, \[r6, #-48\].*
-0+1e8 <[^>]+> 1d42c209 ?	sfmne	f4, 3, \[r2, #-36\].*
-0+1ec <[^>]+> 1d62c209 ?	sfmne	f4, 3, \[r2, #-36\]!.*
diff --git a/gas/testsuite/gas/arm/float.s b/gas/testsuite/gas/arm/float.s
deleted file mode 100644
index 437d298ddd5..00000000000
--- a/gas/testsuite/gas/arm/float.s
+++ /dev/null
@@ -1,163 +0,0 @@
-	.text
-	.align 0
-l:
-	mvfe	f0, f1
-	mvfeqe	f3, f5
-	mvfeqd	f4, #1.0
-	mvfs	f4, f7
-	mvfsp	f0, f1
-	mvfdm	f3, f4
-	mvfez	f7, f7
-
-	adfe	f0, f1, #2.0
-	adfeqe	f1, f2, #0.5
-	adfsm	f3, f4, f5
-	
-	sufd	f0, f0, #2.0
-	sufs	f1, f2, #10.0
-	sufneez f3, f4, f5
-
-	rsfs	f1, f1, #0.0
-	rsfdp	f3, f0, #5.0
-	rsfled	f7, f6, f0
-
-	mufd	f0, f0, f0
-	mufez	f1, f2, #3.0
-	mufals	f0, f0, #4.0
-
-	dvfd	f0, f0, #1.0000
-	dvfez	f0, f1, #10e0
-	dvfmism f3, f4, f5
-
-	rdfe	f0, f1, #1.0e1
-	rdfs	f3, f7, #0f1
-	rdfccdp	f4, f4, f3
-
-	powd	f0, f2, f3
-	pows	f1, f3, #0e1e1
-	powcsez	f4, f7, #1
-
-	rpws	f7, f6, f7
-	rpweqd	f0, f1, f2
-	rpwem	f2, f2, f3
-
-	rmfd	f1, f2, #3
-	rmfvss	f3, f4, f4
-	rmfep	f4, f7, f0
-
-	fmls	f0, f1, f2
-	fmleqs	f1, f3, f5
-	fmlplsz	f4, f6, f0
-
-	fdvs	f1, f3, #10
-	fdvsp	f0, f1, f2
-	fdvhssm	f4, f4, f4
-
-	frds	f1, f1, #1.0
-	frdgts	f2, f1, f0
-	frdgtsz	f4, f4, f5
-
-	pold	f0, f1, f2
-	polsz	f4, f6, #3.0
-	poleqe	f5, f6, f7
-
-	mnfs	f0, f1
-	mnfd	f0, #3.0
-	mnfez	f0, #4.0
-	mnfeqez f0, f5
-	mnfsp	f0, f4
-	mnfdm	f1, f7
-
-	absd	f0, f1
-	abssp	f1, #3.0
-	abseqe	f4, f5
-
-	rnds	f1, f2
-	rndd	f3, f4
-	rndeqez	f6, #4.0
-
-	sqts	f5, f5
-	sqtdp	f6, f6
-	sqtplez f7, f6
-
-	logs	f0, #10
-	loge	f0, #0f10
-	lognedz	f0, f1
-
-	lgne	f1, f2
-	lgndz	f1, f3
-	lgnvcs	f3, f4
-
-	exps	f1, f3
-	expem	f3, #10.0
-	exppld	f6, f7
-
-	sind	f0, f1
-	sinsm	f1, f2
-	singte	f4, #5
-
-	cosd	f1, f3
-	cosem	f4, f5
-	cosnedp	f6, f1
-
-	tane	f1, f5
-	tansz	f4, f7
-	tangedz	f1, #4.0
-
-	asne	f4, f5
-	asnsp	f6, #5e-1
-	asnmidz	f5, f5
-
-	acss	f5, f6
-	acsd	f6, f0
-	acshsem	f1, #0.05e1
-
-	atne	f0, f5
-	atnsz	f1, #5
-	atnltd	f3, f2
-
-	urde	f5, f4
-	nrme	f6, f5
-	nrmpldz	f7, f5
-
-	fltsp	f0, r8
-	flte	f1, r0
-	flteqdz	f5, r7
-
-	fix	r0, f1
-	fixz	r1, f7
-	fixcsm	r5, f5
-
-	wfc	r0
-	wfs	r1
-	rfseq	r2
-	rfc	r4
-
-	cmf	f0, #1
-	cmf	f1, f2
-	cmfeq	f0, f1
-
-	cnf	f0, #3
-	cnf	f1, #0.5
-	cnfvs	f3, f4
-
-	cmfe	f0, f1
-	cmfeeq	f1, f2
-	cmfeqe	f3, #5.0
-
-	cnfe	f1, f3
-	cnfeeq	f3, f4
-	cnfeqe	f4, f7
-	cnfale	f4, #5.0
-
-	lfm	f0, 4, [r0]
-	lfm	f0, 4, [r0, #0]
-	lfm	f1, 4, [r1, #64]
-	sfm	f2, 4, [r14, #1020]!
-	sfmeq	f7, 3, [r8], #-1020
-
-	lfmfd	f6, 2, [r15]
-	sfmea	f7, 1, [r8]!
-	lfmeqea	f5, 4, [r6]
-	sfmnefd	f4, 3, [r2]
-	sfmnefd	f4, 3, [r2]!
diff --git a/gas/testsuite/gas/arm/fp-save.d b/gas/testsuite/gas/arm/fp-save.d
deleted file mode 100644
index 7c367ddca43..00000000000
--- a/gas/testsuite/gas/arm/fp-save.d
+++ /dev/null
@@ -1,9 +0,0 @@
-#objdump: -dr --prefix-addresses --show-raw-insn
-#name: PR5712 - saving FP registers
-#notarget: *-*-pe *-*-wince
-#as: -mfpu=fpa
-
-.*: *file format .*arm.*
-
-Disassembly of section .text:
-0+00 <[^>]*> ed2dc203[ 	]+sfm[ 	]+f4, 1, \[sp, #-12\]!
diff --git a/gas/testsuite/gas/arm/fp-save.s b/gas/testsuite/gas/arm/fp-save.s
deleted file mode 100644
index ffe02bb061c..00000000000
--- a/gas/testsuite/gas/arm/fp-save.s
+++ /dev/null
@@ -1,4 +0,0 @@
-	.fnstart
-	sfmfd   f4, 1, [sp]!
-	.save f4, 1
-	.fnend
diff --git a/gas/testsuite/gas/arm/fpa-dyadic.d b/gas/testsuite/gas/arm/fpa-dyadic.d
deleted file mode 100644
index f603bbff841..00000000000
--- a/gas/testsuite/gas/arm/fpa-dyadic.d
+++ /dev/null
@@ -1,166 +0,0 @@
-#objdump: -dr --prefix-addresses --show-raw-insn
-#name: FPA Dyadic instructions
-#as: -mfpu=fpa -mcpu=arm7m
-
-# Test FPA Dyadic instructions
-# This test should work for both big and little-endian assembly.
-
-.*: *file format .*arm.*
-
-Disassembly of section .text:
-0+000 <[^>]*> ee000100 ?	adfs	f0, f0, f0
-0+004 <[^>]*> ee000120 ?	adfsp	f0, f0, f0
-0+008 <[^>]*> ee000140 ?	adfsm	f0, f0, f0
-0+00c <[^>]*> ee000160 ?	adfsz	f0, f0, f0
-0+010 <[^>]*> ee000180 ?	adfd	f0, f0, f0
-0+014 <[^>]*> ee0001a0 ?	adfdp	f0, f0, f0
-0+018 <[^>]*> ee0001c0 ?	adfdm	f0, f0, f0
-0+01c <[^>]*> ee0001e0 ?	adfdz	f0, f0, f0
-0+020 <[^>]*> ee080100 ?	adfe	f0, f0, f0
-0+024 <[^>]*> ee080120 ?	adfep	f0, f0, f0
-0+028 <[^>]*> ee080140 ?	adfem	f0, f0, f0
-0+02c <[^>]*> ee080160 ?	adfez	f0, f0, f0
-0+030 <[^>]*> ee200100 ?	sufs	f0, f0, f0
-0+034 <[^>]*> ee200120 ?	sufsp	f0, f0, f0
-0+038 <[^>]*> ee200140 ?	sufsm	f0, f0, f0
-0+03c <[^>]*> ee200160 ?	sufsz	f0, f0, f0
-0+040 <[^>]*> ee200180 ?	sufd	f0, f0, f0
-0+044 <[^>]*> ee2001a0 ?	sufdp	f0, f0, f0
-0+048 <[^>]*> ee2001c0 ?	sufdm	f0, f0, f0
-0+04c <[^>]*> ee2001e0 ?	sufdz	f0, f0, f0
-0+050 <[^>]*> ee280100 ?	sufe	f0, f0, f0
-0+054 <[^>]*> ee280120 ?	sufep	f0, f0, f0
-0+058 <[^>]*> ee280140 ?	sufem	f0, f0, f0
-0+05c <[^>]*> ee280160 ?	sufez	f0, f0, f0
-0+060 <[^>]*> ee300100 ?	rsfs	f0, f0, f0
-0+064 <[^>]*> ee300120 ?	rsfsp	f0, f0, f0
-0+068 <[^>]*> ee300140 ?	rsfsm	f0, f0, f0
-0+06c <[^>]*> ee300160 ?	rsfsz	f0, f0, f0
-0+070 <[^>]*> ee300180 ?	rsfd	f0, f0, f0
-0+074 <[^>]*> ee3001a0 ?	rsfdp	f0, f0, f0
-0+078 <[^>]*> ee3001c0 ?	rsfdm	f0, f0, f0
-0+07c <[^>]*> ee3001e0 ?	rsfdz	f0, f0, f0
-0+080 <[^>]*> ee380100 ?	rsfe	f0, f0, f0
-0+084 <[^>]*> ee380120 ?	rsfep	f0, f0, f0
-0+088 <[^>]*> ee380140 ?	rsfem	f0, f0, f0
-0+08c <[^>]*> ee380160 ?	rsfez	f0, f0, f0
-0+090 <[^>]*> ee100100 ?	mufs	f0, f0, f0
-0+094 <[^>]*> ee100120 ?	mufsp	f0, f0, f0
-0+098 <[^>]*> ee100140 ?	mufsm	f0, f0, f0
-0+09c <[^>]*> ee100160 ?	mufsz	f0, f0, f0
-0+0a0 <[^>]*> ee100180 ?	mufd	f0, f0, f0
-0+0a4 <[^>]*> ee1001a0 ?	mufdp	f0, f0, f0
-0+0a8 <[^>]*> ee1001c0 ?	mufdm	f0, f0, f0
-0+0ac <[^>]*> ee1001e0 ?	mufdz	f0, f0, f0
-0+0b0 <[^>]*> ee180100 ?	mufe	f0, f0, f0
-0+0b4 <[^>]*> ee180120 ?	mufep	f0, f0, f0
-0+0b8 <[^>]*> ee180140 ?	mufem	f0, f0, f0
-0+0bc <[^>]*> ee180160 ?	mufez	f0, f0, f0
-0+0c0 <[^>]*> ee400100 ?	dvfs	f0, f0, f0
-0+0c4 <[^>]*> ee400120 ?	dvfsp	f0, f0, f0
-0+0c8 <[^>]*> ee400140 ?	dvfsm	f0, f0, f0
-0+0cc <[^>]*> ee400160 ?	dvfsz	f0, f0, f0
-0+0d0 <[^>]*> ee400180 ?	dvfd	f0, f0, f0
-0+0d4 <[^>]*> ee4001a0 ?	dvfdp	f0, f0, f0
-0+0d8 <[^>]*> ee4001c0 ?	dvfdm	f0, f0, f0
-0+0dc <[^>]*> ee4001e0 ?	dvfdz	f0, f0, f0
-0+0e0 <[^>]*> ee480100 ?	dvfe	f0, f0, f0
-0+0e4 <[^>]*> ee480120 ?	dvfep	f0, f0, f0
-0+0e8 <[^>]*> ee480140 ?	dvfem	f0, f0, f0
-0+0ec <[^>]*> ee480160 ?	dvfez	f0, f0, f0
-0+0f0 <[^>]*> ee500100 ?	rdfs	f0, f0, f0
-0+0f4 <[^>]*> ee500120 ?	rdfsp	f0, f0, f0
-0+0f8 <[^>]*> ee500140 ?	rdfsm	f0, f0, f0
-0+0fc <[^>]*> ee500160 ?	rdfsz	f0, f0, f0
-0+100 <[^>]*> ee500180 ?	rdfd	f0, f0, f0
-0+104 <[^>]*> ee5001a0 ?	rdfdp	f0, f0, f0
-0+108 <[^>]*> ee5001c0 ?	rdfdm	f0, f0, f0
-0+10c <[^>]*> ee5001e0 ?	rdfdz	f0, f0, f0
-0+110 <[^>]*> ee580100 ?	rdfe	f0, f0, f0
-0+114 <[^>]*> ee580120 ?	rdfep	f0, f0, f0
-0+118 <[^>]*> ee580140 ?	rdfem	f0, f0, f0
-0+11c <[^>]*> ee580160 ?	rdfez	f0, f0, f0
-0+120 <[^>]*> ee600100 ?	pows	f0, f0, f0
-0+124 <[^>]*> ee600120 ?	powsp	f0, f0, f0
-0+128 <[^>]*> ee600140 ?	powsm	f0, f0, f0
-0+12c <[^>]*> ee600160 ?	powsz	f0, f0, f0
-0+130 <[^>]*> ee600180 ?	powd	f0, f0, f0
-0+134 <[^>]*> ee6001a0 ?	powdp	f0, f0, f0
-0+138 <[^>]*> ee6001c0 ?	powdm	f0, f0, f0
-0+13c <[^>]*> ee6001e0 ?	powdz	f0, f0, f0
-0+140 <[^>]*> ee680100 ?	powe	f0, f0, f0
-0+144 <[^>]*> ee680120 ?	powep	f0, f0, f0
-0+148 <[^>]*> ee680140 ?	powem	f0, f0, f0
-0+14c <[^>]*> ee680160 ?	powez	f0, f0, f0
-0+150 <[^>]*> ee700100 ?	rpws	f0, f0, f0
-0+154 <[^>]*> ee700120 ?	rpwsp	f0, f0, f0
-0+158 <[^>]*> ee700140 ?	rpwsm	f0, f0, f0
-0+15c <[^>]*> ee700160 ?	rpwsz	f0, f0, f0
-0+160 <[^>]*> ee700180 ?	rpwd	f0, f0, f0
-0+164 <[^>]*> ee7001a0 ?	rpwdp	f0, f0, f0
-0+168 <[^>]*> ee7001c0 ?	rpwdm	f0, f0, f0
-0+16c <[^>]*> ee7001e0 ?	rpwdz	f0, f0, f0
-0+170 <[^>]*> ee780100 ?	rpwe	f0, f0, f0
-0+174 <[^>]*> ee780120 ?	rpwep	f0, f0, f0
-0+178 <[^>]*> ee780140 ?	rpwem	f0, f0, f0
-0+17c <[^>]*> ee780160 ?	rpwez	f0, f0, f0
-0+180 <[^>]*> ee800100 ?	rmfs	f0, f0, f0
-0+184 <[^>]*> ee800120 ?	rmfsp	f0, f0, f0
-0+188 <[^>]*> ee800140 ?	rmfsm	f0, f0, f0
-0+18c <[^>]*> ee800160 ?	rmfsz	f0, f0, f0
-0+190 <[^>]*> ee800180 ?	rmfd	f0, f0, f0
-0+194 <[^>]*> ee8001a0 ?	rmfdp	f0, f0, f0
-0+198 <[^>]*> ee8001c0 ?	rmfdm	f0, f0, f0
-0+19c <[^>]*> ee8001e0 ?	rmfdz	f0, f0, f0
-0+1a0 <[^>]*> ee880100 ?	rmfe	f0, f0, f0
-0+1a4 <[^>]*> ee880120 ?	rmfep	f0, f0, f0
-0+1a8 <[^>]*> ee880140 ?	rmfem	f0, f0, f0
-0+1ac <[^>]*> ee880160 ?	rmfez	f0, f0, f0
-0+1b0 <[^>]*> ee900100 ?	fmls	f0, f0, f0
-0+1b4 <[^>]*> ee900120 ?	fmlsp	f0, f0, f0
-0+1b8 <[^>]*> ee900140 ?	fmlsm	f0, f0, f0
-0+1bc <[^>]*> ee900160 ?	fmlsz	f0, f0, f0
-0+1c0 <[^>]*> ee900180 ?	fmld	f0, f0, f0
-0+1c4 <[^>]*> ee9001a0 ?	fmldp	f0, f0, f0
-0+1c8 <[^>]*> ee9001c0 ?	fmldm	f0, f0, f0
-0+1cc <[^>]*> ee9001e0 ?	fmldz	f0, f0, f0
-0+1d0 <[^>]*> ee980100 ?	fmle	f0, f0, f0
-0+1d4 <[^>]*> ee980120 ?	fmlep	f0, f0, f0
-0+1d8 <[^>]*> ee980140 ?	fmlem	f0, f0, f0
-0+1dc <[^>]*> ee980160 ?	fmlez	f0, f0, f0
-0+1e0 <[^>]*> eea00100 ?	fdvs	f0, f0, f0
-0+1e4 <[^>]*> eea00120 ?	fdvsp	f0, f0, f0
-0+1e8 <[^>]*> eea00140 ?	fdvsm	f0, f0, f0
-0+1ec <[^>]*> eea00160 ?	fdvsz	f0, f0, f0
-0+1f0 <[^>]*> eea00180 ?	fdvd	f0, f0, f0
-0+1f4 <[^>]*> eea001a0 ?	fdvdp	f0, f0, f0
-0+1f8 <[^>]*> eea001c0 ?	fdvdm	f0, f0, f0
-0+1fc <[^>]*> eea001e0 ?	fdvdz	f0, f0, f0
-0+200 <[^>]*> eea80100 ?	fdve	f0, f0, f0
-0+204 <[^>]*> eea80120 ?	fdvep	f0, f0, f0
-0+208 <[^>]*> eea80140 ?	fdvem	f0, f0, f0
-0+20c <[^>]*> eea80160 ?	fdvez	f0, f0, f0
-0+210 <[^>]*> eeb00100 ?	frds	f0, f0, f0
-0+214 <[^>]*> eeb00120 ?	frdsp	f0, f0, f0
-0+218 <[^>]*> eeb00140 ?	frdsm	f0, f0, f0
-0+21c <[^>]*> eeb00160 ?	frdsz	f0, f0, f0
-0+220 <[^>]*> eeb00180 ?	frdd	f0, f0, f0
-0+224 <[^>]*> eeb001a0 ?	frddp	f0, f0, f0
-0+228 <[^>]*> eeb001c0 ?	frddm	f0, f0, f0
-0+22c <[^>]*> eeb001e0 ?	frddz	f0, f0, f0
-0+230 <[^>]*> eeb80100 ?	frde	f0, f0, f0
-0+234 <[^>]*> eeb80120 ?	frdep	f0, f0, f0
-0+238 <[^>]*> eeb80140 ?	frdem	f0, f0, f0
-0+23c <[^>]*> eeb80160 ?	frdez	f0, f0, f0
-0+240 <[^>]*> eec00100 ?	pols	f0, f0, f0
-0+244 <[^>]*> eec00120 ?	polsp	f0, f0, f0
-0+248 <[^>]*> eec00140 ?	polsm	f0, f0, f0
-0+24c <[^>]*> eec00160 ?	polsz	f0, f0, f0
-0+250 <[^>]*> eec00180 ?	pold	f0, f0, f0
-0+254 <[^>]*> eec001a0 ?	poldp	f0, f0, f0
-0+258 <[^>]*> eec001c0 ?	poldm	f0, f0, f0
-0+25c <[^>]*> eec001e0 ?	poldz	f0, f0, f0
-0+260 <[^>]*> eec80100 ?	pole	f0, f0, f0
-0+264 <[^>]*> eec80120 ?	polep	f0, f0, f0
-0+268 <[^>]*> eec80140 ?	polem	f0, f0, f0
-0+26c <[^>]*> eec80160 ?	polez	f0, f0, f0
diff --git a/gas/testsuite/gas/arm/fpa-dyadic.s b/gas/testsuite/gas/arm/fpa-dyadic.s
deleted file mode 100644
index aebcd2b9c2e..00000000000
--- a/gas/testsuite/gas/arm/fpa-dyadic.s
+++ /dev/null
@@ -1,172 +0,0 @@
-	.text
-	.globl F
-F:
-	adfs	f0, f0, f0
-	adfsp	f0, f0, f0
-	adfsm	f0, f0, f0
-	adfsz	f0, f0, f0
-	adfd	f0, f0, f0
-	adfdp	f0, f0, f0
-	adfdm	f0, f0, f0
-	adfdz	f0, f0, f0
-	adfe	f0, f0, f0
-	adfep	f0, f0, f0
-	adfem	f0, f0, f0
-	adfez	f0, f0, f0
-
-	sufs	f0, f0, f0
-	sufsp	f0, f0, f0
-	sufsm	f0, f0, f0
-	sufsz	f0, f0, f0
-	sufd	f0, f0, f0
-	sufdp	f0, f0, f0
-	sufdm	f0, f0, f0
-	sufdz	f0, f0, f0
-	sufe	f0, f0, f0
-	sufep	f0, f0, f0
-	sufem	f0, f0, f0
-	sufez	f0, f0, f0
-
-	rsfs	f0, f0, f0
-	rsfsp	f0, f0, f0
-	rsfsm	f0, f0, f0
-	rsfsz	f0, f0, f0
-	rsfd	f0, f0, f0
-	rsfdp	f0, f0, f0
-	rsfdm	f0, f0, f0
-	rsfdz	f0, f0, f0
-	rsfe	f0, f0, f0
-	rsfep	f0, f0, f0
-	rsfem	f0, f0, f0
-	rsfez	f0, f0, f0
-
-	mufs	f0, f0, f0
-	mufsp	f0, f0, f0
-	mufsm	f0, f0, f0
-	mufsz	f0, f0, f0
-	mufd	f0, f0, f0
-	mufdp	f0, f0, f0
-	mufdm	f0, f0, f0
-	mufdz	f0, f0, f0
-	mufe	f0, f0, f0
-	mufep	f0, f0, f0
-	mufem	f0, f0, f0
-	mufez	f0, f0, f0
-
-	dvfs	f0, f0, f0
-	dvfsp	f0, f0, f0
-	dvfsm	f0, f0, f0
-	dvfsz	f0, f0, f0
-	dvfd	f0, f0, f0
-	dvfdp	f0, f0, f0
-	dvfdm	f0, f0, f0
-	dvfdz	f0, f0, f0
-	dvfe	f0, f0, f0
-	dvfep	f0, f0, f0
-	dvfem	f0, f0, f0
-	dvfez	f0, f0, f0
-
-	rdfs	f0, f0, f0
-	rdfsp	f0, f0, f0
-	rdfsm	f0, f0, f0
-	rdfsz	f0, f0, f0
-	rdfd	f0, f0, f0
-	rdfdp	f0, f0, f0
-	rdfdm	f0, f0, f0
-	rdfdz	f0, f0, f0
-	rdfe	f0, f0, f0
-	rdfep	f0, f0, f0
-	rdfem	f0, f0, f0
-	rdfez	f0, f0, f0
-
-	pows	f0, f0, f0
-	powsp	f0, f0, f0
-	powsm	f0, f0, f0
-	powsz	f0, f0, f0
-	powd	f0, f0, f0
-	powdp	f0, f0, f0
-	powdm	f0, f0, f0
-	powdz	f0, f0, f0
-	powe	f0, f0, f0
-	powep	f0, f0, f0
-	powem	f0, f0, f0
-	powez	f0, f0, f0
-
-	rpws	f0, f0, f0
-	rpwsp	f0, f0, f0
-	rpwsm	f0, f0, f0
-	rpwsz	f0, f0, f0
-	rpwd	f0, f0, f0
-	rpwdp	f0, f0, f0
-	rpwdm	f0, f0, f0
-	rpwdz	f0, f0, f0
-	rpwe	f0, f0, f0
-	rpwep	f0, f0, f0
-	rpwem	f0, f0, f0
-	rpwez	f0, f0, f0
-
-	rmfs	f0, f0, f0
-	rmfsp	f0, f0, f0
-	rmfsm	f0, f0, f0
-	rmfsz	f0, f0, f0
-	rmfd	f0, f0, f0
-	rmfdp	f0, f0, f0
-	rmfdm	f0, f0, f0
-	rmfdz	f0, f0, f0
-	rmfe	f0, f0, f0
-	rmfep	f0, f0, f0
-	rmfem	f0, f0, f0
-	rmfez	f0, f0, f0
-
-	fmls	f0, f0, f0
-	fmlsp	f0, f0, f0
-	fmlsm	f0, f0, f0
-	fmlsz	f0, f0, f0
-	fmld	f0, f0, f0
-	fmldp	f0, f0, f0
-	fmldm	f0, f0, f0
-	fmldz	f0, f0, f0
-	fmle	f0, f0, f0
-	fmlep	f0, f0, f0
-	fmlem	f0, f0, f0
-	fmlez	f0, f0, f0
-
-	fdvs	f0, f0, f0
-	fdvsp	f0, f0, f0
-	fdvsm	f0, f0, f0
-	fdvsz	f0, f0, f0
-	fdvd	f0, f0, f0
-	fdvdp	f0, f0, f0
-	fdvdm	f0, f0, f0
-	fdvdz	f0, f0, f0
-	fdve	f0, f0, f0
-	fdvep	f0, f0, f0
-	fdvem	f0, f0, f0
-	fdvez	f0, f0, f0
-
-	frds	f0, f0, f0
-	frdsp	f0, f0, f0
-	frdsm	f0, f0, f0
-	frdsz	f0, f0, f0
-	frdd	f0, f0, f0
-	frddp	f0, f0, f0
-	frddm	f0, f0, f0
-	frddz	f0, f0, f0
-	frde	f0, f0, f0
-	frdep	f0, f0, f0
-	frdem	f0, f0, f0
-	frdez	f0, f0, f0
-
-	pols	f0, f0, f0
-	polsp	f0, f0, f0
-	polsm	f0, f0, f0
-	polsz	f0, f0, f0
-	pold	f0, f0, f0
-	poldp	f0, f0, f0
-	poldm	f0, f0, f0
-	poldz	f0, f0, f0
-	pole	f0, f0, f0
-	polep	f0, f0, f0
-	polem	f0, f0, f0
-	polez	f0, f0, f0
-
diff --git a/gas/testsuite/gas/arm/fpa-mem.d b/gas/testsuite/gas/arm/fpa-mem.d
deleted file mode 100644
index 4a638e1f900..00000000000
--- a/gas/testsuite/gas/arm/fpa-mem.d
+++ /dev/null
@@ -1,34 +0,0 @@
-#objdump: -dr --prefix-addresses --show-raw-insn
-#name: FPA memory insructions
-#as: -mfpu=fpa10 -mcpu=arm7m
-
-# Test FPA memory instructions
-# This test should work for both big and little-endian assembly.
-
-.*: *file format .*arm.*
-
-Disassembly of section .text:
-0+00 <[^>]*> ed900100 ?	ldfs	f0, \[r0\]
-0+04 <[^>]*> ec300101 ?	ldfs	f0, \[r0\], #-4
-0+08 <[^>]*> ed908100 ?	ldfd	f0, \[r0\]
-0+0c <[^>]*> ec308101 ?	ldfd	f0, \[r0\], #-4
-0+10 <[^>]*> edd00100 ?	ldfe	f0, \[r0\]
-0+14 <[^>]*> ec700101 ?	ldfe	f0, \[r0\], #-4
-0+18 <[^>]*> edd08100 ?	ldfp	f0, \[r0\]
-0+1c <[^>]*> ec708101 ?	ldfp	f0, \[r0\], #-4
-0+20 <[^>]*> ed800100 ?	stfs	f0, \[r0\]
-0+24 <[^>]*> ec200101 ?	stfs	f0, \[r0\], #-4
-0+28 <[^>]*> ed808100 ?	stfd	f0, \[r0\]
-0+2c <[^>]*> ec208101 ?	stfd	f0, \[r0\], #-4
-0+30 <[^>]*> edc00100 ?	stfe	f0, \[r0\]
-0+34 <[^>]*> ec600101 ?	stfe	f0, \[r0\], #-4
-0+38 <[^>]*> edc08100 ?	stfp	f0, \[r0\]
-0+3c <[^>]*> ec608101 ?	stfp	f0, \[r0\], #-4
-0+40 <[^>]*> ed900200 ?	lfm	f0, 4, \[r0\]
-0+44 <[^>]*> ed900200 ?	lfm	f0, 4, \[r0\]
-0+48 <[^>]*> ed10020c ?	lfm	f0, 4, \[r0, #-48\].*
-0+4c <[^>]*> ed800200 ?	sfm	f0, 4, \[r0\]
-0+50 <[^>]*> ed00020c ?	sfm	f0, 4, \[r0, #-48\].*
-0+54 <[^>]*> ed800200 ?	sfm	f0, 4, \[r0\]
-0+58 <[^>]*> 5d800100 ?	stfpls	f0, \[r0\]
-0+5c <[^>]*> 5d800100 ?	stfpls	f0, \[r0\]
diff --git a/gas/testsuite/gas/arm/fpa-mem.s b/gas/testsuite/gas/arm/fpa-mem.s
deleted file mode 100644
index bcb4ae3ae86..00000000000
--- a/gas/testsuite/gas/arm/fpa-mem.s
+++ /dev/null
@@ -1,32 +0,0 @@
-	.text
-	.globl F
-F:
-	ldfs	f0, [r0]
-	ldfs	f0, [r0], #-4
-	ldfd	f0, [r0]
-	ldfd	f0, [r0], #-4
-	ldfe	f0, [r0]
-	ldfe	f0, [r0], #-4
-	ldfp	f0, [r0]
-	ldfp	f0, [r0], #-4
-
-	stfs	f0, [r0]
-	stfs	f0, [r0], #-4
-	stfd	f0, [r0]
-	stfd	f0, [r0], #-4
-	stfe	f0, [r0]
-	stfe	f0, [r0], #-4
-	stfp	f0, [r0]
-	stfp	f0, [r0], #-4
-	lfm	f0, 4, [r0]
-	lfmfd	f0, 4, [r0]
-	lfmea	f0, 4, [r0]
-	sfm	f0, 4, [r0]
-	sfmfd	f0, 4, [r0]
-	sfmea	f0, 4, [r0]
-	
-	# Test mnemonic that is ambiguous between infix and suffic
-	# condition codes
-	stfpls	f0, [r0]
-	.syntax unified
-	stfpls	f0, [r0]
diff --git a/gas/testsuite/gas/arm/fpa-monadic.d b/gas/testsuite/gas/arm/fpa-monadic.d
deleted file mode 100644
index a688ee4be68..00000000000
--- a/gas/testsuite/gas/arm/fpa-monadic.d
+++ /dev/null
@@ -1,202 +0,0 @@
-#objdump: -dr --prefix-addresses --show-raw-insn
-#name: FPA Monadic instructions
-#as: -mfpu=fpa -mcpu=arm7m
-
-# Test FPA Monadic instructions
-# This test should work for both big and little-endian assembly.
-
-.*: *file format .*arm.*
-
-Disassembly of section .text:
-0+000 <[^>]*> ee008100 ?	mvfs	f0, f0
-0+004 <[^>]*> ee008120 ?	mvfsp	f0, f0
-0+008 <[^>]*> ee008140 ?	mvfsm	f0, f0
-0+00c <[^>]*> ee008160 ?	mvfsz	f0, f0
-0+010 <[^>]*> ee008180 ?	mvfd	f0, f0
-0+014 <[^>]*> ee0081a0 ?	mvfdp	f0, f0
-0+018 <[^>]*> ee0081c0 ?	mvfdm	f0, f0
-0+01c <[^>]*> ee0081e0 ?	mvfdz	f0, f0
-0+020 <[^>]*> ee088100 ?	mvfe	f0, f0
-0+024 <[^>]*> ee088120 ?	mvfep	f0, f0
-0+028 <[^>]*> ee088140 ?	mvfem	f0, f0
-0+02c <[^>]*> ee088160 ?	mvfez	f0, f0
-0+030 <[^>]*> ee108100 ?	mnfs	f0, f0
-0+034 <[^>]*> ee108120 ?	mnfsp	f0, f0
-0+038 <[^>]*> ee108140 ?	mnfsm	f0, f0
-0+03c <[^>]*> ee108160 ?	mnfsz	f0, f0
-0+040 <[^>]*> ee108180 ?	mnfd	f0, f0
-0+044 <[^>]*> ee1081a0 ?	mnfdp	f0, f0
-0+048 <[^>]*> ee1081c0 ?	mnfdm	f0, f0
-0+04c <[^>]*> ee1081e0 ?	mnfdz	f0, f0
-0+050 <[^>]*> ee188100 ?	mnfe	f0, f0
-0+054 <[^>]*> ee188120 ?	mnfep	f0, f0
-0+058 <[^>]*> ee188140 ?	mnfem	f0, f0
-0+05c <[^>]*> ee188160 ?	mnfez	f0, f0
-0+060 <[^>]*> ee208100 ?	abss	f0, f0
-0+064 <[^>]*> ee208120 ?	abssp	f0, f0
-0+068 <[^>]*> ee208140 ?	abssm	f0, f0
-0+06c <[^>]*> ee208160 ?	abssz	f0, f0
-0+070 <[^>]*> ee208180 ?	absd	f0, f0
-0+074 <[^>]*> ee2081a0 ?	absdp	f0, f0
-0+078 <[^>]*> ee2081c0 ?	absdm	f0, f0
-0+07c <[^>]*> ee2081e0 ?	absdz	f0, f0
-0+080 <[^>]*> ee288100 ?	abse	f0, f0
-0+084 <[^>]*> ee288120 ?	absep	f0, f0
-0+088 <[^>]*> ee288140 ?	absem	f0, f0
-0+08c <[^>]*> ee288160 ?	absez	f0, f0
-0+090 <[^>]*> ee308100 ?	rnds	f0, f0
-0+094 <[^>]*> ee308120 ?	rndsp	f0, f0
-0+098 <[^>]*> ee308140 ?	rndsm	f0, f0
-0+09c <[^>]*> ee308160 ?	rndsz	f0, f0
-0+0a0 <[^>]*> ee308180 ?	rndd	f0, f0
-0+0a4 <[^>]*> ee3081a0 ?	rnddp	f0, f0
-0+0a8 <[^>]*> ee3081c0 ?	rnddm	f0, f0
-0+0ac <[^>]*> ee3081e0 ?	rnddz	f0, f0
-0+0b0 <[^>]*> ee388100 ?	rnde	f0, f0
-0+0b4 <[^>]*> ee388120 ?	rndep	f0, f0
-0+0b8 <[^>]*> ee388140 ?	rndem	f0, f0
-0+0bc <[^>]*> ee388160 ?	rndez	f0, f0
-0+0c0 <[^>]*> ee408100 ?	sqts	f0, f0
-0+0c4 <[^>]*> ee408120 ?	sqtsp	f0, f0
-0+0c8 <[^>]*> ee408140 ?	sqtsm	f0, f0
-0+0cc <[^>]*> ee408160 ?	sqtsz	f0, f0
-0+0d0 <[^>]*> ee408180 ?	sqtd	f0, f0
-0+0d4 <[^>]*> ee4081a0 ?	sqtdp	f0, f0
-0+0d8 <[^>]*> ee4081c0 ?	sqtdm	f0, f0
-0+0dc <[^>]*> ee4081e0 ?	sqtdz	f0, f0
-0+0e0 <[^>]*> ee488100 ?	sqte	f0, f0
-0+0e4 <[^>]*> ee488120 ?	sqtep	f0, f0
-0+0e8 <[^>]*> ee488140 ?	sqtem	f0, f0
-0+0ec <[^>]*> ee488160 ?	sqtez	f0, f0
-0+0f0 <[^>]*> ee508100 ?	logs	f0, f0
-0+0f4 <[^>]*> ee508120 ?	logsp	f0, f0
-0+0f8 <[^>]*> ee508140 ?	logsm	f0, f0
-0+0fc <[^>]*> ee508160 ?	logsz	f0, f0
-0+100 <[^>]*> ee508180 ?	logd	f0, f0
-0+104 <[^>]*> ee5081a0 ?	logdp	f0, f0
-0+108 <[^>]*> ee5081c0 ?	logdm	f0, f0
-0+10c <[^>]*> ee5081e0 ?	logdz	f0, f0
-0+110 <[^>]*> ee588100 ?	loge	f0, f0
-0+114 <[^>]*> ee588120 ?	logep	f0, f0
-0+118 <[^>]*> ee588140 ?	logem	f0, f0
-0+11c <[^>]*> ee588160 ?	logez	f0, f0
-0+120 <[^>]*> ee608100 ?	lgns	f0, f0
-0+124 <[^>]*> ee608120 ?	lgnsp	f0, f0
-0+128 <[^>]*> ee608140 ?	lgnsm	f0, f0
-0+12c <[^>]*> ee608160 ?	lgnsz	f0, f0
-0+130 <[^>]*> ee608180 ?	lgnd	f0, f0
-0+134 <[^>]*> ee6081a0 ?	lgndp	f0, f0
-0+138 <[^>]*> ee6081c0 ?	lgndm	f0, f0
-0+13c <[^>]*> ee6081e0 ?	lgndz	f0, f0
-0+140 <[^>]*> ee688100 ?	lgne	f0, f0
-0+144 <[^>]*> ee688120 ?	lgnep	f0, f0
-0+148 <[^>]*> ee688140 ?	lgnem	f0, f0
-0+14c <[^>]*> ee688160 ?	lgnez	f0, f0
-0+150 <[^>]*> ee708100 ?	exps	f0, f0
-0+154 <[^>]*> ee708120 ?	expsp	f0, f0
-0+158 <[^>]*> ee708140 ?	expsm	f0, f0
-0+15c <[^>]*> ee708160 ?	expsz	f0, f0
-0+160 <[^>]*> ee708180 ?	expd	f0, f0
-0+164 <[^>]*> ee7081a0 ?	expdp	f0, f0
-0+168 <[^>]*> ee7081c0 ?	expdm	f0, f0
-0+16c <[^>]*> ee7081e0 ?	expdz	f0, f0
-0+170 <[^>]*> ee788100 ?	expe	f0, f0
-0+174 <[^>]*> ee788120 ?	expep	f0, f0
-0+178 <[^>]*> ee788140 ?	expem	f0, f0
-0+17c <[^>]*> ee7081e0 ?	expdz	f0, f0
-0+180 <[^>]*> ee808100 ?	sins	f0, f0
-0+184 <[^>]*> ee808120 ?	sinsp	f0, f0
-0+188 <[^>]*> ee808140 ?	sinsm	f0, f0
-0+18c <[^>]*> ee808160 ?	sinsz	f0, f0
-0+190 <[^>]*> ee808180 ?	sind	f0, f0
-0+194 <[^>]*> ee8081a0 ?	sindp	f0, f0
-0+198 <[^>]*> ee8081c0 ?	sindm	f0, f0
-0+19c <[^>]*> ee8081e0 ?	sindz	f0, f0
-0+1a0 <[^>]*> ee888100 ?	sine	f0, f0
-0+1a4 <[^>]*> ee888120 ?	sinep	f0, f0
-0+1a8 <[^>]*> ee888140 ?	sinem	f0, f0
-0+1ac <[^>]*> ee888160 ?	sinez	f0, f0
-0+1b0 <[^>]*> ee908100 ?	coss	f0, f0
-0+1b4 <[^>]*> ee908120 ?	cossp	f0, f0
-0+1b8 <[^>]*> ee908140 ?	cossm	f0, f0
-0+1bc <[^>]*> ee908160 ?	cossz	f0, f0
-0+1c0 <[^>]*> ee908180 ?	cosd	f0, f0
-0+1c4 <[^>]*> ee9081a0 ?	cosdp	f0, f0
-0+1c8 <[^>]*> ee9081c0 ?	cosdm	f0, f0
-0+1cc <[^>]*> ee9081e0 ?	cosdz	f0, f0
-0+1d0 <[^>]*> ee988100 ?	cose	f0, f0
-0+1d4 <[^>]*> ee988120 ?	cosep	f0, f0
-0+1d8 <[^>]*> ee988140 ?	cosem	f0, f0
-0+1dc <[^>]*> ee988160 ?	cosez	f0, f0
-0+1e0 <[^>]*> eea08100 ?	tans	f0, f0
-0+1e4 <[^>]*> eea08120 ?	tansp	f0, f0
-0+1e8 <[^>]*> eea08140 ?	tansm	f0, f0
-0+1ec <[^>]*> eea08160 ?	tansz	f0, f0
-0+1f0 <[^>]*> eea08180 ?	tand	f0, f0
-0+1f4 <[^>]*> eea081a0 ?	tandp	f0, f0
-0+1f8 <[^>]*> eea081c0 ?	tandm	f0, f0
-0+1fc <[^>]*> eea081e0 ?	tandz	f0, f0
-0+200 <[^>]*> eea88100 ?	tane	f0, f0
-0+204 <[^>]*> eea88120 ?	tanep	f0, f0
-0+208 <[^>]*> eea88140 ?	tanem	f0, f0
-0+20c <[^>]*> eea88160 ?	tanez	f0, f0
-0+210 <[^>]*> eeb08100 ?	asns	f0, f0
-0+214 <[^>]*> eeb08120 ?	asnsp	f0, f0
-0+218 <[^>]*> eeb08140 ?	asnsm	f0, f0
-0+21c <[^>]*> eeb08160 ?	asnsz	f0, f0
-0+220 <[^>]*> eeb08180 ?	asnd	f0, f0
-0+224 <[^>]*> eeb081a0 ?	asndp	f0, f0
-0+228 <[^>]*> eeb081c0 ?	asndm	f0, f0
-0+22c <[^>]*> eeb081e0 ?	asndz	f0, f0
-0+230 <[^>]*> eeb88100 ?	asne	f0, f0
-0+234 <[^>]*> eeb88120 ?	asnep	f0, f0
-0+238 <[^>]*> eeb88140 ?	asnem	f0, f0
-0+23c <[^>]*> eeb88160 ?	asnez	f0, f0
-0+240 <[^>]*> eec08100 ?	acss	f0, f0
-0+244 <[^>]*> eec08120 ?	acssp	f0, f0
-0+248 <[^>]*> eec08140 ?	acssm	f0, f0
-0+24c <[^>]*> eec08160 ?	acssz	f0, f0
-0+250 <[^>]*> eec08180 ?	acsd	f0, f0
-0+254 <[^>]*> eec081a0 ?	acsdp	f0, f0
-0+258 <[^>]*> eec081c0 ?	acsdm	f0, f0
-0+25c <[^>]*> eec081e0 ?	acsdz	f0, f0
-0+260 <[^>]*> eec88100 ?	acse	f0, f0
-0+264 <[^>]*> eec88120 ?	acsep	f0, f0
-0+268 <[^>]*> eec88140 ?	acsem	f0, f0
-0+26c <[^>]*> eec88160 ?	acsez	f0, f0
-0+270 <[^>]*> eed08100 ?	atns	f0, f0
-0+274 <[^>]*> eed08120 ?	atnsp	f0, f0
-0+278 <[^>]*> eed08140 ?	atnsm	f0, f0
-0+27c <[^>]*> eed08160 ?	atnsz	f0, f0
-0+280 <[^>]*> eed08180 ?	atnd	f0, f0
-0+284 <[^>]*> eed081a0 ?	atndp	f0, f0
-0+288 <[^>]*> eed081c0 ?	atndm	f0, f0
-0+28c <[^>]*> eed081e0 ?	atndz	f0, f0
-0+290 <[^>]*> eed88100 ?	atne	f0, f0
-0+294 <[^>]*> eed88120 ?	atnep	f0, f0
-0+298 <[^>]*> eed88140 ?	atnem	f0, f0
-0+29c <[^>]*> eed88160 ?	atnez	f0, f0
-0+2a0 <[^>]*> eee08100 ?	urds	f0, f0
-0+2a4 <[^>]*> eee08120 ?	urdsp	f0, f0
-0+2a8 <[^>]*> eee08140 ?	urdsm	f0, f0
-0+2ac <[^>]*> eee08160 ?	urdsz	f0, f0
-0+2b0 <[^>]*> eee08180 ?	urdd	f0, f0
-0+2b4 <[^>]*> eee081a0 ?	urddp	f0, f0
-0+2b8 <[^>]*> eee081c0 ?	urddm	f0, f0
-0+2bc <[^>]*> eee081e0 ?	urddz	f0, f0
-0+2c0 <[^>]*> eee88100 ?	urde	f0, f0
-0+2c4 <[^>]*> eee88120 ?	urdep	f0, f0
-0+2c8 <[^>]*> eee88140 ?	urdem	f0, f0
-0+2cc <[^>]*> eee88160 ?	urdez	f0, f0
-0+2d0 <[^>]*> eef08100 ?	nrms	f0, f0
-0+2d4 <[^>]*> eef08120 ?	nrmsp	f0, f0
-0+2d8 <[^>]*> eef08140 ?	nrmsm	f0, f0
-0+2dc <[^>]*> eef08160 ?	nrmsz	f0, f0
-0+2e0 <[^>]*> eef08180 ?	nrmd	f0, f0
-0+2e4 <[^>]*> eef081a0 ?	nrmdp	f0, f0
-0+2e8 <[^>]*> eef081c0 ?	nrmdm	f0, f0
-0+2ec <[^>]*> eef081e0 ?	nrmdz	f0, f0
-0+2f0 <[^>]*> eef88100 ?	nrme	f0, f0
-0+2f4 <[^>]*> eef88120 ?	nrmep	f0, f0
-0+2f8 <[^>]*> eef88140 ?	nrmem	f0, f0
-0+2fc <[^>]*> eef88160 ?	nrmez	f0, f0
diff --git a/gas/testsuite/gas/arm/fpa-monadic.s b/gas/testsuite/gas/arm/fpa-monadic.s
deleted file mode 100644
index 2af03f4ea03..00000000000
--- a/gas/testsuite/gas/arm/fpa-monadic.s
+++ /dev/null
@@ -1,210 +0,0 @@
-	.text
-	.globl F
-F:
-	mvfs	f0, f0
-	mvfsp	f0, f0
-	mvfsm	f0, f0
-	mvfsz	f0, f0
-	mvfd	f0, f0
-	mvfdp	f0, f0
-	mvfdm	f0, f0
-	mvfdz	f0, f0
-	mvfe	f0, f0
-	mvfep	f0, f0
-	mvfem	f0, f0
-	mvfez	f0, f0
-
-	mnfs	f0, f0
-	mnfsp	f0, f0
-	mnfsm	f0, f0
-	mnfsz	f0, f0
-	mnfd	f0, f0
-	mnfdp	f0, f0
-	mnfdm	f0, f0
-	mnfdz	f0, f0
-	mnfe	f0, f0
-	mnfep	f0, f0
-	mnfem	f0, f0
-	mnfez	f0, f0
-
-	abss	f0, f0
-	abssp	f0, f0
-	abssm	f0, f0
-	abssz	f0, f0
-	absd	f0, f0
-	absdp	f0, f0
-	absdm	f0, f0
-	absdz	f0, f0
-	abse	f0, f0
-	absep	f0, f0
-	absem	f0, f0
-	absez	f0, f0
-
-	rnds	f0, f0
-	rndsp	f0, f0
-	rndsm	f0, f0
-	rndsz	f0, f0
-	rndd	f0, f0
-	rnddp	f0, f0
-	rnddm	f0, f0
-	rnddz	f0, f0
-	rnde	f0, f0
-	rndep	f0, f0
-	rndem	f0, f0
-	rndez	f0, f0
-
-	sqts	f0, f0
-	sqtsp	f0, f0
-	sqtsm	f0, f0
-	sqtsz	f0, f0
-	sqtd	f0, f0
-	sqtdp	f0, f0
-	sqtdm	f0, f0
-	sqtdz	f0, f0
-	sqte	f0, f0
-	sqtep	f0, f0
-	sqtem	f0, f0
-	sqtez	f0, f0
-
-	logs	f0, f0
-	logsp	f0, f0
-	logsm	f0, f0
-	logsz	f0, f0
-	logd	f0, f0
-	logdp	f0, f0
-	logdm	f0, f0
-	logdz	f0, f0
-	loge	f0, f0
-	logep	f0, f0
-	logem	f0, f0
-	logez	f0, f0
-
-	lgns	f0, f0
-	lgnsp	f0, f0
-	lgnsm	f0, f0
-	lgnsz	f0, f0
-	lgnd	f0, f0
-	lgndp	f0, f0
-	lgndm	f0, f0
-	lgndz	f0, f0
-	lgne	f0, f0
-	lgnep	f0, f0
-	lgnem	f0, f0
-	lgnez	f0, f0
-
-	exps	f0, f0
-	expsp	f0, f0
-	expsm	f0, f0
-	expsz	f0, f0
-	expd	f0, f0
-	expdp	f0, f0
-	expdm	f0, f0
-	expdz	f0, f0
-	expe	f0, f0
-	expep	f0, f0
-	expem	f0, f0
-	expdz	f0, f0
-
-	sins	f0, f0
-	sinsp	f0, f0
-	sinsm	f0, f0
-	sinsz	f0, f0
-	sind	f0, f0
-	sindp	f0, f0
-	sindm	f0, f0
-	sindz	f0, f0
-	sine	f0, f0
-	sinep	f0, f0
-	sinem	f0, f0
-	sinez	f0, f0
-
-	coss	f0, f0
-	cossp	f0, f0
-	cossm	f0, f0
-	cossz	f0, f0
-	cosd	f0, f0
-	cosdp	f0, f0
-	cosdm	f0, f0
-	cosdz	f0, f0
-	cose	f0, f0
-	cosep	f0, f0
-	cosem	f0, f0
-	cosez	f0, f0
-
-	tans	f0, f0
-	tansp	f0, f0
-	tansm	f0, f0
-	tansz	f0, f0
-	tand	f0, f0
-	tandp	f0, f0
-	tandm	f0, f0
-	tandz	f0, f0
-	tane	f0, f0
-	tanep	f0, f0
-	tanem	f0, f0
-	tanez	f0, f0
-
-	asns	f0, f0
-	asnsp	f0, f0
-	asnsm	f0, f0
-	asnsz	f0, f0
-	asnd	f0, f0
-	asndp	f0, f0
-	asndm	f0, f0
-	asndz	f0, f0
-	asne	f0, f0
-	asnep	f0, f0
-	asnem	f0, f0
-	asnez	f0, f0
-
-	acss	f0, f0
-	acssp	f0, f0
-	acssm	f0, f0
-	acssz	f0, f0
-	acsd	f0, f0
-	acsdp	f0, f0
-	acsdm	f0, f0
-	acsdz	f0, f0
-	acse	f0, f0
-	acsep	f0, f0
-	acsem	f0, f0
-	acsez	f0, f0
-
-	atns	f0, f0
-	atnsp	f0, f0
-	atnsm	f0, f0
-	atnsz	f0, f0
-	atnd	f0, f0
-	atndp	f0, f0
-	atndm	f0, f0
-	atndz	f0, f0
-	atne	f0, f0
-	atnep	f0, f0
-	atnem	f0, f0
-	atnez	f0, f0
-
-	urds	f0, f0
-	urdsp	f0, f0
-	urdsm	f0, f0
-	urdsz	f0, f0
-	urdd	f0, f0
-	urddp	f0, f0
-	urddm	f0, f0
-	urddz	f0, f0
-	urde	f0, f0
-	urdep	f0, f0
-	urdem	f0, f0
-	urdez	f0, f0
-
-	nrms	f0, f0
-	nrmsp	f0, f0
-	nrmsm	f0, f0
-	nrmsz	f0, f0
-	nrmd	f0, f0
-	nrmdp	f0, f0
-	nrmdm	f0, f0
-	nrmdz	f0, f0
-	nrme	f0, f0
-	nrmep	f0, f0
-	nrmem	f0, f0
-	nrmez	f0, f0
diff --git a/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.l b/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.l
index 191c5c659ea..3cf8638e617 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.l
+++ b/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.l
@@ -191,198 +191,6 @@
 [^:]*:51: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
 [^:]*:51: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
 [^:]*:51: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:93: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:94: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:95: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:96: Error: bad offset 0x00000001 \(must be word-aligned\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:98: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:99: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:100: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
-[^:]*:101: Error: bad offset 0x00000808 \(must be an 8-bit number of words\)
 [^:]*:143: Error: bad offset 0x00000001 \(must be word-aligned\)
 [^:]*:143: Error: bad offset 0x00000001 \(must be word-aligned\)
 [^:]*:143: Error: bad offset 0x00000001 \(must be word-aligned\)
diff --git a/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.s b/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.s
index 1d402f9eee3..8608125058f 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.s
+++ b/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.s
@@ -50,55 +50,55 @@
 	ldctest ldc2 stc2 0x808
 	ldctest ldc2l stc2l 0x808
 
-@ LDFS/STFS/LDFD/STFD/LDFE/STFE/LDFP/STFP
 
-	.fpu	fpa
 
-	.macro	fpa_test load store cst
 
-	\load	f0, [r0, #:pc_g0:(f + \cst)]
-	\load	f0, [r0, #:pc_g1:(f + \cst)]
-	\load	f0, [r0, #:pc_g2:(f + \cst)]
 
-	\load	f0, [r0, #:sb_g0:(f + \cst)]
-	\load	f0, [r0, #:sb_g1:(f + \cst)]
-	\load	f0, [r0, #:sb_g2:(f + \cst)]
 
-	\store	f0, [r0, #:pc_g0:(f + \cst)]
-	\store	f0, [r0, #:pc_g1:(f + \cst)]
-	\store	f0, [r0, #:pc_g2:(f + \cst)]
 
-	\store	f0, [r0, #:sb_g0:(f + \cst)]
-	\store	f0, [r0, #:sb_g1:(f + \cst)]
-	\store	f0, [r0, #:sb_g2:(f + \cst)]
 
-	\load	f0, [r0, #:pc_g0:(f - \cst)]
-	\load	f0, [r0, #:pc_g1:(f - \cst)]
-	\load	f0, [r0, #:pc_g2:(f - \cst)]
 
-	\load	f0, [r0, #:sb_g0:(f - \cst)]
-	\load	f0, [r0, #:sb_g1:(f - \cst)]
-	\load	f0, [r0, #:sb_g2:(f - \cst)]
 
-	\store	f0, [r0, #:pc_g0:(f - \cst)]
-	\store	f0, [r0, #:pc_g1:(f - \cst)]
-	\store	f0, [r0, #:pc_g2:(f - \cst)]
 
-	\store	f0, [r0, #:sb_g0:(f - \cst)]
-	\store	f0, [r0, #:sb_g1:(f - \cst)]
-	\store	f0, [r0, #:sb_g2:(f - \cst)]
 
-	.endm
 
-	fpa_test ldfs stfs 0x1
-	fpa_test ldfd stfd 0x1
-	fpa_test ldfe stfe 0x1
-	fpa_test ldfp stfp 0x1
 
-	fpa_test ldfs stfs 0x808
-	fpa_test ldfd stfd 0x808
-	fpa_test ldfe stfe 0x808
-	fpa_test ldfp stfp 0x808
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 @ FLDS/FSTS
 
diff --git a/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.l b/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.l
index 69526865312..94b9efb8313 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.l
+++ b/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.l
@@ -79,86 +79,6 @@
 [^:]*:33: *Info: macro .*
 [^:]*:10: Error: unknown group relocation -- `stc2l 0,c0,\[r0,#:foo:\(sym\)\]'
 [^:]*:33: *Info: macro .*
-[^:]*:16: Error: this group relocation is not allowed on this instruction -- `ldfs f0,\[r0,#:pc_g0_nc:\(sym\)\]'
-[^:]*:37: *Info: macro .*
-[^:]*:17: Error: this group relocation is not allowed on this instruction -- `ldfs f0,\[r0,#:pc_g1_nc:\(sym\)\]'
-[^:]*:37: *Info: macro .*
-[^:]*:18: Error: this group relocation is not allowed on this instruction -- `ldfs f0,\[r0,#:sb_g0_nc:\(sym\)\]'
-[^:]*:37: *Info: macro .*
-[^:]*:19: Error: this group relocation is not allowed on this instruction -- `ldfs f0,\[r0,#:sb_g1_nc:\(sym\)\]'
-[^:]*:37: *Info: macro .*
-[^:]*:21: Error: unknown group relocation -- `ldfs f0,\[r0,#:foo:\(sym\)\]'
-[^:]*:37: *Info: macro .*
-[^:]*:16: Error: this group relocation is not allowed on this instruction -- `stfs f0,\[r0,#:pc_g0_nc:\(sym\)\]'
-[^:]*:38: *Info: macro .*
-[^:]*:17: Error: this group relocation is not allowed on this instruction -- `stfs f0,\[r0,#:pc_g1_nc:\(sym\)\]'
-[^:]*:38: *Info: macro .*
-[^:]*:18: Error: this group relocation is not allowed on this instruction -- `stfs f0,\[r0,#:sb_g0_nc:\(sym\)\]'
-[^:]*:38: *Info: macro .*
-[^:]*:19: Error: this group relocation is not allowed on this instruction -- `stfs f0,\[r0,#:sb_g1_nc:\(sym\)\]'
-[^:]*:38: *Info: macro .*
-[^:]*:21: Error: unknown group relocation -- `stfs f0,\[r0,#:foo:\(sym\)\]'
-[^:]*:38: *Info: macro .*
-[^:]*:16: Error: this group relocation is not allowed on this instruction -- `ldfd f0,\[r0,#:pc_g0_nc:\(sym\)\]'
-[^:]*:39: *Info: macro .*
-[^:]*:17: Error: this group relocation is not allowed on this instruction -- `ldfd f0,\[r0,#:pc_g1_nc:\(sym\)\]'
-[^:]*:39: *Info: macro .*
-[^:]*:18: Error: this group relocation is not allowed on this instruction -- `ldfd f0,\[r0,#:sb_g0_nc:\(sym\)\]'
-[^:]*:39: *Info: macro .*
-[^:]*:19: Error: this group relocation is not allowed on this instruction -- `ldfd f0,\[r0,#:sb_g1_nc:\(sym\)\]'
-[^:]*:39: *Info: macro .*
-[^:]*:21: Error: unknown group relocation -- `ldfd f0,\[r0,#:foo:\(sym\)\]'
-[^:]*:39: *Info: macro .*
-[^:]*:16: Error: this group relocation is not allowed on this instruction -- `stfd f0,\[r0,#:pc_g0_nc:\(sym\)\]'
-[^:]*:40: *Info: macro .*
-[^:]*:17: Error: this group relocation is not allowed on this instruction -- `stfd f0,\[r0,#:pc_g1_nc:\(sym\)\]'
-[^:]*:40: *Info: macro .*
-[^:]*:18: Error: this group relocation is not allowed on this instruction -- `stfd f0,\[r0,#:sb_g0_nc:\(sym\)\]'
-[^:]*:40: *Info: macro .*
-[^:]*:19: Error: this group relocation is not allowed on this instruction -- `stfd f0,\[r0,#:sb_g1_nc:\(sym\)\]'
-[^:]*:40: *Info: macro .*
-[^:]*:21: Error: unknown group relocation -- `stfd f0,\[r0,#:foo:\(sym\)\]'
-[^:]*:40: *Info: macro .*
-[^:]*:16: Error: this group relocation is not allowed on this instruction -- `ldfe f0,\[r0,#:pc_g0_nc:\(sym\)\]'
-[^:]*:41: *Info: macro .*
-[^:]*:17: Error: this group relocation is not allowed on this instruction -- `ldfe f0,\[r0,#:pc_g1_nc:\(sym\)\]'
-[^:]*:41: *Info: macro .*
-[^:]*:18: Error: this group relocation is not allowed on this instruction -- `ldfe f0,\[r0,#:sb_g0_nc:\(sym\)\]'
-[^:]*:41: *Info: macro .*
-[^:]*:19: Error: this group relocation is not allowed on this instruction -- `ldfe f0,\[r0,#:sb_g1_nc:\(sym\)\]'
-[^:]*:41: *Info: macro .*
-[^:]*:21: Error: unknown group relocation -- `ldfe f0,\[r0,#:foo:\(sym\)\]'
-[^:]*:41: *Info: macro .*
-[^:]*:16: Error: this group relocation is not allowed on this instruction -- `stfe f0,\[r0,#:pc_g0_nc:\(sym\)\]'
-[^:]*:42: *Info: macro .*
-[^:]*:17: Error: this group relocation is not allowed on this instruction -- `stfe f0,\[r0,#:pc_g1_nc:\(sym\)\]'
-[^:]*:42: *Info: macro .*
-[^:]*:18: Error: this group relocation is not allowed on this instruction -- `stfe f0,\[r0,#:sb_g0_nc:\(sym\)\]'
-[^:]*:42: *Info: macro .*
-[^:]*:19: Error: this group relocation is not allowed on this instruction -- `stfe f0,\[r0,#:sb_g1_nc:\(sym\)\]'
-[^:]*:42: *Info: macro .*
-[^:]*:21: Error: unknown group relocation -- `stfe f0,\[r0,#:foo:\(sym\)\]'
-[^:]*:42: *Info: macro .*
-[^:]*:16: Error: this group relocation is not allowed on this instruction -- `ldfp f0,\[r0,#:pc_g0_nc:\(sym\)\]'
-[^:]*:43: *Info: macro .*
-[^:]*:17: Error: this group relocation is not allowed on this instruction -- `ldfp f0,\[r0,#:pc_g1_nc:\(sym\)\]'
-[^:]*:43: *Info: macro .*
-[^:]*:18: Error: this group relocation is not allowed on this instruction -- `ldfp f0,\[r0,#:sb_g0_nc:\(sym\)\]'
-[^:]*:43: *Info: macro .*
-[^:]*:19: Error: this group relocation is not allowed on this instruction -- `ldfp f0,\[r0,#:sb_g1_nc:\(sym\)\]'
-[^:]*:43: *Info: macro .*
-[^:]*:21: Error: unknown group relocation -- `ldfp f0,\[r0,#:foo:\(sym\)\]'
-[^:]*:43: *Info: macro .*
-[^:]*:16: Error: this group relocation is not allowed on this instruction -- `stfp f0,\[r0,#:pc_g0_nc:\(sym\)\]'
-[^:]*:44: *Info: macro .*
-[^:]*:17: Error: this group relocation is not allowed on this instruction -- `stfp f0,\[r0,#:pc_g1_nc:\(sym\)\]'
-[^:]*:44: *Info: macro .*
-[^:]*:18: Error: this group relocation is not allowed on this instruction -- `stfp f0,\[r0,#:sb_g0_nc:\(sym\)\]'
-[^:]*:44: *Info: macro .*
-[^:]*:19: Error: this group relocation is not allowed on this instruction -- `stfp f0,\[r0,#:sb_g1_nc:\(sym\)\]'
-[^:]*:44: *Info: macro .*
-[^:]*:21: Error: unknown group relocation -- `stfp f0,\[r0,#:foo:\(sym\)\]'
-[^:]*:44: *Info: macro .*
 [^:]*:16: Error: this group relocation is not allowed on this instruction -- `flds s0,\[r0,#:pc_g0_nc:\(sym\)\]'
 [^:]*:48: *Info: macro .*
 [^:]*:17: Error: this group relocation is not allowed on this instruction -- `flds s0,\[r0,#:pc_g1_nc:\(sym\)\]'
diff --git a/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.s b/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.s
index d10e363a8ed..80a651b4d8f 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.s
+++ b/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.s
@@ -32,16 +32,16 @@
 	ldctest stc2 c0
 	ldctest stc2l c0
 
-	.fpu 	fpa
-
-	ldctest2 ldfs f0
-	ldctest2 stfs f0
-	ldctest2 ldfd f0
-	ldctest2 stfd f0
-	ldctest2 ldfe f0
-	ldctest2 stfe f0
-	ldctest2 ldfp f0
-	ldctest2 stfp f0
+
+
+
+
+
+
+
+
+
+
 
 	.fpu	vfp
 
diff --git a/gas/testsuite/gas/arm/group-reloc-ldc.d b/gas/testsuite/gas/arm/group-reloc-ldc.d
index 870703d6a44..7c51c720b5c 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldc.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldc.d
@@ -197,339 +197,147 @@ Disassembly of section .text:
 			178: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> fd400085 	stc2l	0, cr0, \[r0, #-532\].*
 			17c: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed900185 	ldfs	f0, \[r0, #532\].*
-			180: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed900185 	ldfs	f0, \[r0, #532\].*
-			184: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed900185 	ldfs	f0, \[r0, #532\].*
-			188: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed900185 	ldfs	f0, \[r0, #532\].*
-			18c: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed900185 	ldfs	f0, \[r0, #532\].*
-			190: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed900185 	ldfs	f0, \[r0, #532\].*
-			194: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed800185 	stfs	f0, \[r0, #532\].*
-			198: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed800185 	stfs	f0, \[r0, #532\].*
-			19c: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed800185 	stfs	f0, \[r0, #532\].*
-			1a0: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed800185 	stfs	f0, \[r0, #532\].*
-			1a4: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed800185 	stfs	f0, \[r0, #532\].*
-			1a8: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed800185 	stfs	f0, \[r0, #532\].*
-			1ac: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed100185 	ldfs	f0, \[r0, #-532\].*
-			1b0: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed100185 	ldfs	f0, \[r0, #-532\].*
-			1b4: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed100185 	ldfs	f0, \[r0, #-532\].*
-			1b8: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed100185 	ldfs	f0, \[r0, #-532\].*
-			1bc: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed100185 	ldfs	f0, \[r0, #-532\].*
-			1c0: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed100185 	ldfs	f0, \[r0, #-532\].*
-			1c4: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed000185 	stfs	f0, \[r0, #-532\].*
-			1c8: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed000185 	stfs	f0, \[r0, #-532\].*
-			1cc: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed000185 	stfs	f0, \[r0, #-532\].*
-			1d0: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed000185 	stfs	f0, \[r0, #-532\].*
-			1d4: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed000185 	stfs	f0, \[r0, #-532\].*
-			1d8: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed000185 	stfs	f0, \[r0, #-532\].*
-			1dc: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed908185 	ldfd	f0, \[r0, #532\].*
-			1e0: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed908185 	ldfd	f0, \[r0, #532\].*
-			1e4: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed908185 	ldfd	f0, \[r0, #532\].*
-			1e8: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed908185 	ldfd	f0, \[r0, #532\].*
-			1ec: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed908185 	ldfd	f0, \[r0, #532\].*
-			1f0: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed908185 	ldfd	f0, \[r0, #532\].*
-			1f4: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed808185 	stfd	f0, \[r0, #532\].*
-			1f8: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed808185 	stfd	f0, \[r0, #532\].*
-			1fc: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed808185 	stfd	f0, \[r0, #532\].*
-			200: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed808185 	stfd	f0, \[r0, #532\].*
-			204: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed808185 	stfd	f0, \[r0, #532\].*
-			208: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed808185 	stfd	f0, \[r0, #532\].*
-			20c: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed108185 	ldfd	f0, \[r0, #-532\].*
-			210: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed108185 	ldfd	f0, \[r0, #-532\].*
-			214: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed108185 	ldfd	f0, \[r0, #-532\].*
-			218: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed108185 	ldfd	f0, \[r0, #-532\].*
-			21c: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed108185 	ldfd	f0, \[r0, #-532\].*
-			220: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed108185 	ldfd	f0, \[r0, #-532\].*
-			224: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed008185 	stfd	f0, \[r0, #-532\].*
-			228: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed008185 	stfd	f0, \[r0, #-532\].*
-			22c: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed008185 	stfd	f0, \[r0, #-532\].*
-			230: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed008185 	stfd	f0, \[r0, #-532\].*
-			234: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed008185 	stfd	f0, \[r0, #-532\].*
-			238: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed008185 	stfd	f0, \[r0, #-532\].*
-			23c: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> edd00185 	ldfe	f0, \[r0, #532\].*
-			240: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> edd00185 	ldfe	f0, \[r0, #532\].*
-			244: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> edd00185 	ldfe	f0, \[r0, #532\].*
-			248: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> edd00185 	ldfe	f0, \[r0, #532\].*
-			24c: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> edd00185 	ldfe	f0, \[r0, #532\].*
-			250: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> edd00185 	ldfe	f0, \[r0, #532\].*
-			254: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> edc00185 	stfe	f0, \[r0, #532\].*
-			258: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> edc00185 	stfe	f0, \[r0, #532\].*
-			25c: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> edc00185 	stfe	f0, \[r0, #532\].*
-			260: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> edc00185 	stfe	f0, \[r0, #532\].*
-			264: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> edc00185 	stfe	f0, \[r0, #532\].*
-			268: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> edc00185 	stfe	f0, \[r0, #532\].*
-			26c: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed500185 	ldfe	f0, \[r0, #-532\].*
-			270: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed500185 	ldfe	f0, \[r0, #-532\].*
-			274: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed500185 	ldfe	f0, \[r0, #-532\].*
-			278: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed500185 	ldfe	f0, \[r0, #-532\].*
-			27c: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed500185 	ldfe	f0, \[r0, #-532\].*
-			280: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed500185 	ldfe	f0, \[r0, #-532\].*
-			284: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed400185 	stfe	f0, \[r0, #-532\].*
-			288: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed400185 	stfe	f0, \[r0, #-532\].*
-			28c: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed400185 	stfe	f0, \[r0, #-532\].*
-			290: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed400185 	stfe	f0, \[r0, #-532\].*
-			294: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed400185 	stfe	f0, \[r0, #-532\].*
-			298: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed400185 	stfe	f0, \[r0, #-532\].*
-			29c: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> edd08185 	ldfp	f0, \[r0, #532\].*
-			2a0: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> edd08185 	ldfp	f0, \[r0, #532\].*
-			2a4: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> edd08185 	ldfp	f0, \[r0, #532\].*
-			2a8: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> edd08185 	ldfp	f0, \[r0, #532\].*
-			2ac: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> edd08185 	ldfp	f0, \[r0, #532\].*
-			2b0: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> edd08185 	ldfp	f0, \[r0, #532\].*
-			2b4: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> edc08185 	stfp	f0, \[r0, #532\].*
-			2b8: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> edc08185 	stfp	f0, \[r0, #532\].*
-			2bc: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> edc08185 	stfp	f0, \[r0, #532\].*
-			2c0: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> edc08185 	stfp	f0, \[r0, #532\].*
-			2c4: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> edc08185 	stfp	f0, \[r0, #532\].*
-			2c8: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> edc08185 	stfp	f0, \[r0, #532\].*
-			2cc: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed508185 	ldfp	f0, \[r0, #-532\].*
-			2d0: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed508185 	ldfp	f0, \[r0, #-532\].*
-			2d4: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed508185 	ldfp	f0, \[r0, #-532\].*
-			2d8: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed508185 	ldfp	f0, \[r0, #-532\].*
-			2dc: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed508185 	ldfp	f0, \[r0, #-532\].*
-			2e0: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed508185 	ldfp	f0, \[r0, #-532\].*
-			2e4: R_ARM_LDC_SB_G2	f
-0[0-9a-f]+ <[^>]+> ed408185 	stfp	f0, \[r0, #-532\].*
-			2e8: R_ARM_LDC_PC_G0	f
-0[0-9a-f]+ <[^>]+> ed408185 	stfp	f0, \[r0, #-532\].*
-			2ec: R_ARM_LDC_PC_G1	f
-0[0-9a-f]+ <[^>]+> ed408185 	stfp	f0, \[r0, #-532\].*
-			2f0: R_ARM_LDC_PC_G2	f
-0[0-9a-f]+ <[^>]+> ed408185 	stfp	f0, \[r0, #-532\].*
-			2f4: R_ARM_LDC_SB_G0	f
-0[0-9a-f]+ <[^>]+> ed408185 	stfp	f0, \[r0, #-532\].*
-			2f8: R_ARM_LDC_SB_G1	f
-0[0-9a-f]+ <[^>]+> ed408185 	stfp	f0, \[r0, #-532\].*
-			2fc: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed900a85 	(vldr|flds)	s0, \[r0, #532\].*
-			300: R_ARM_LDC_PC_G0	f
+			180: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed900a85 	(vldr|flds)	s0, \[r0, #532\].*
-			304: R_ARM_LDC_PC_G1	f
+			184: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed900a85 	(vldr|flds)	s0, \[r0, #532\].*
-			308: R_ARM_LDC_PC_G2	f
+			188: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed900a85 	(vldr|flds)	s0, \[r0, #532\].*
-			30c: R_ARM_LDC_SB_G0	f
+			18c: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed900a85 	(vldr|flds)	s0, \[r0, #532\].*
-			310: R_ARM_LDC_SB_G1	f
+			190: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed900a85 	(vldr|flds)	s0, \[r0, #532\].*
-			314: R_ARM_LDC_SB_G2	f
+			194: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed800a85 	(vstr|fsts)	s0, \[r0, #532\].*
-			318: R_ARM_LDC_PC_G0	f
+			198: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed800a85 	(vstr|fsts)	s0, \[r0, #532\].*
-			31c: R_ARM_LDC_PC_G1	f
+			19c: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed800a85 	(vstr|fsts)	s0, \[r0, #532\].*
-			320: R_ARM_LDC_PC_G2	f
+			1a0: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed800a85 	(vstr|fsts)	s0, \[r0, #532\].*
-			324: R_ARM_LDC_SB_G0	f
+			1a4: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed800a85 	(vstr|fsts)	s0, \[r0, #532\].*
-			328: R_ARM_LDC_SB_G1	f
+			1a8: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed800a85 	(vstr|fsts)	s0, \[r0, #532\].*
-			32c: R_ARM_LDC_SB_G2	f
+			1ac: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed100a85 	(vldr|flds)	s0, \[r0, #-532\].*
-			330: R_ARM_LDC_PC_G0	f
+			1b0: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed100a85 	(vldr|flds)	s0, \[r0, #-532\].*
-			334: R_ARM_LDC_PC_G1	f
+			1b4: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed100a85 	(vldr|flds)	s0, \[r0, #-532\].*
-			338: R_ARM_LDC_PC_G2	f
+			1b8: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed100a85 	(vldr|flds)	s0, \[r0, #-532\].*
-			33c: R_ARM_LDC_SB_G0	f
+			1bc: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed100a85 	(vldr|flds)	s0, \[r0, #-532\].*
-			340: R_ARM_LDC_SB_G1	f
+			1c0: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed100a85 	(vldr|flds)	s0, \[r0, #-532\].*
-			344: R_ARM_LDC_SB_G2	f
+			1c4: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed000a85 	(vstr|fsts)	s0, \[r0, #-532\].*
-			348: R_ARM_LDC_PC_G0	f
+			1c8: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed000a85 	(vstr|fsts)	s0, \[r0, #-532\].*
-			34c: R_ARM_LDC_PC_G1	f
+			1cc: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed000a85 	(vstr|fsts)	s0, \[r0, #-532\].*
-			350: R_ARM_LDC_PC_G2	f
+			1d0: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed000a85 	(vstr|fsts)	s0, \[r0, #-532\].*
-			354: R_ARM_LDC_SB_G0	f
+			1d4: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed000a85 	(vstr|fsts)	s0, \[r0, #-532\].*
-			358: R_ARM_LDC_SB_G1	f
+			1d8: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed000a85 	(vstr|fsts)	s0, \[r0, #-532\].*
-			35c: R_ARM_LDC_SB_G2	f
+			1dc: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			360: R_ARM_LDC_PC_G0	f
+			1e0: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			364: R_ARM_LDC_PC_G1	f
+			1e4: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			368: R_ARM_LDC_PC_G2	f
+			1e8: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			36c: R_ARM_LDC_SB_G0	f
+			1ec: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			370: R_ARM_LDC_SB_G1	f
+			1f0: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			374: R_ARM_LDC_SB_G2	f
+			1f4: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			378: R_ARM_LDC_PC_G0	f
+			1f8: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			37c: R_ARM_LDC_PC_G1	f
+			1fc: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			380: R_ARM_LDC_PC_G2	f
+			200: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			384: R_ARM_LDC_SB_G0	f
+			204: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			388: R_ARM_LDC_SB_G1	f
+			208: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			38c: R_ARM_LDC_SB_G2	f
+			20c: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			390: R_ARM_LDC_PC_G0	f
+			210: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			394: R_ARM_LDC_PC_G1	f
+			214: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			398: R_ARM_LDC_PC_G2	f
+			218: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			39c: R_ARM_LDC_SB_G0	f
+			21c: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			3a0: R_ARM_LDC_SB_G1	f
+			220: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			3a4: R_ARM_LDC_SB_G2	f
+			224: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			3a8: R_ARM_LDC_PC_G0	f
+			228: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			3ac: R_ARM_LDC_PC_G1	f
+			22c: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			3b0: R_ARM_LDC_PC_G2	f
+			230: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			3b4: R_ARM_LDC_SB_G0	f
+			234: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			3b8: R_ARM_LDC_SB_G1	f
+			238: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			3bc: R_ARM_LDC_SB_G2	f
+			23c: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			3c0: R_ARM_LDC_PC_G0	f
+			240: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			3c4: R_ARM_LDC_PC_G1	f
+			244: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			3c8: R_ARM_LDC_PC_G2	f
+			248: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			3cc: R_ARM_LDC_SB_G0	f
+			24c: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			3d0: R_ARM_LDC_SB_G1	f
+			250: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed900b85 	vldr	d0, \[r0, #532\].*
-			3d4: R_ARM_LDC_SB_G2	f
+			254: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			3d8: R_ARM_LDC_PC_G0	f
+			258: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			3dc: R_ARM_LDC_PC_G1	f
+			25c: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			3e0: R_ARM_LDC_PC_G2	f
+			260: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			3e4: R_ARM_LDC_SB_G0	f
+			264: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			3e8: R_ARM_LDC_SB_G1	f
+			268: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed800b85 	vstr	d0, \[r0, #532\].*
-			3ec: R_ARM_LDC_SB_G2	f
+			26c: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			3f0: R_ARM_LDC_PC_G0	f
+			270: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			3f4: R_ARM_LDC_PC_G1	f
+			274: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			3f8: R_ARM_LDC_PC_G2	f
+			278: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			3fc: R_ARM_LDC_SB_G0	f
+			27c: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			400: R_ARM_LDC_SB_G1	f
+			280: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed100b85 	vldr	d0, \[r0, #-532\].*
-			404: R_ARM_LDC_SB_G2	f
+			284: R_ARM_LDC_SB_G2	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			408: R_ARM_LDC_PC_G0	f
+			288: R_ARM_LDC_PC_G0	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			40c: R_ARM_LDC_PC_G1	f
+			28c: R_ARM_LDC_PC_G1	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			410: R_ARM_LDC_PC_G2	f
+			290: R_ARM_LDC_PC_G2	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			414: R_ARM_LDC_SB_G0	f
+			294: R_ARM_LDC_SB_G0	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			418: R_ARM_LDC_SB_G1	f
+			298: R_ARM_LDC_SB_G1	f
 0[0-9a-f]+ <[^>]+> ed000b85 	vstr	d0, \[r0, #-532\].*
-			41c: R_ARM_LDC_SB_G2	f
+			29c: R_ARM_LDC_SB_G2	f
diff --git a/gas/testsuite/gas/arm/group-reloc-ldc.s b/gas/testsuite/gas/arm/group-reloc-ldc.s
index f17fa89551b..fdf26f16395 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldc.s
+++ b/gas/testsuite/gas/arm/group-reloc-ldc.s
@@ -45,51 +45,6 @@
 	ldctest ldc2 stc2
 	ldctest ldc2l stc2l
 
-@ LDFS/STFS/LDFD/STFD/LDFE/STFE/LDFP/STFP
-
-	.fpu	fpa
-
-	.macro	fpa_test load store
-
-	\load	f0, [r0, #:pc_g0:(f + 0x214)]
-	\load	f0, [r0, #:pc_g1:(f + 0x214)]
-	\load	f0, [r0, #:pc_g2:(f + 0x214)]
-
-	\load	f0, [r0, #:sb_g0:(f + 0x214)]
-	\load	f0, [r0, #:sb_g1:(f + 0x214)]
-	\load	f0, [r0, #:sb_g2:(f + 0x214)]
-
-	\store	f0, [r0, #:pc_g0:(f + 0x214)]
-	\store	f0, [r0, #:pc_g1:(f + 0x214)]
-	\store	f0, [r0, #:pc_g2:(f + 0x214)]
-
-	\store	f0, [r0, #:sb_g0:(f + 0x214)]
-	\store	f0, [r0, #:sb_g1:(f + 0x214)]
-	\store	f0, [r0, #:sb_g2:(f + 0x214)]
-
-	\load	f0, [r0, #:pc_g0:(f - 0x214)]
-	\load	f0, [r0, #:pc_g1:(f - 0x214)]
-	\load	f0, [r0, #:pc_g2:(f - 0x214)]
-
-	\load	f0, [r0, #:sb_g0:(f - 0x214)]
-	\load	f0, [r0, #:sb_g1:(f - 0x214)]
-	\load	f0, [r0, #:sb_g2:(f - 0x214)]
-
-	\store	f0, [r0, #:pc_g0:(f - 0x214)]
-	\store	f0, [r0, #:pc_g1:(f - 0x214)]
-	\store	f0, [r0, #:pc_g2:(f - 0x214)]
-
-	\store	f0, [r0, #:sb_g0:(f - 0x214)]
-	\store	f0, [r0, #:sb_g1:(f - 0x214)]
-	\store	f0, [r0, #:sb_g2:(f - 0x214)]
-
-	.endm
-
-	fpa_test ldfs stfs
-	fpa_test ldfd stfd
-	fpa_test ldfe stfe
-	fpa_test ldfp stfp
-
 @ FLDS/FSTS
 
 	.fpu	vfp
diff --git a/gas/testsuite/gas/arm/le-fpconst.d b/gas/testsuite/gas/arm/le-fpconst.d
deleted file mode 100644
index 846da89f029..00000000000
--- a/gas/testsuite/gas/arm/le-fpconst.d
+++ /dev/null
@@ -1,11 +0,0 @@
-#objdump: -s --section=.text
-#as: -EL
-#name: arm little-endian fpconst
-# Not all arm targets are bi-endian, so only run this test on ones
-# we know that are.  FIXME We should probably also key off armeb/armel.
-#target: *-*-pe
-
-.*: +file format .*arm.*
-
-Contents of section .text:
- 0000 cdcc8c3f 00000000 9999f13f 9a999999 .*
diff --git a/gas/testsuite/gas/arm/le-fpconst.s b/gas/testsuite/gas/arm/le-fpconst.s
deleted file mode 100644
index 8a3c3d70145..00000000000
--- a/gas/testsuite/gas/arm/le-fpconst.s
+++ /dev/null
@@ -1,8 +0,0 @@
-# Test fp constants.
-# These need ARM specific support because 8 byte fp constants in little
-# endian mode are represented abnormally.
-	
-	.text
-	.float 1.1
-	.float 0
-	.double 1.1
