Index: gas/config/tc-arm.c
===================================================================
--- gas/config/tc-arm.c	2011-02-28 12:05:55.000000000 +0000
+++ gas/config/tc-arm.c	2011-02-28 12:17:54.000000000 +0000
@@ -21735,11 +21735,14 @@ arm_force_relocation (struct fix * fixp)
   /* Resolve these relocations even if the symbol is extern or weak.  */
   if (fixp->fx_r_type == BFD_RELOC_ARM_IMMEDIATE
       || fixp->fx_r_type == BFD_RELOC_ARM_OFFSET_IMM
+      || fixp->fx_r_type == BFD_RELOC_ARM_OFFSET_IMM8
       || fixp->fx_r_type == BFD_RELOC_ARM_ADRL_IMMEDIATE
       || fixp->fx_r_type == BFD_RELOC_ARM_T32_ADD_IMM
       || fixp->fx_r_type == BFD_RELOC_ARM_T32_IMMEDIATE
       || fixp->fx_r_type == BFD_RELOC_ARM_T32_IMM12
-      || fixp->fx_r_type == BFD_RELOC_ARM_T32_ADD_PC12)
+      || fixp->fx_r_type == BFD_RELOC_ARM_T32_ADD_PC12
+      || fixp->fx_r_type == BFD_RELOC_ARM_THUMB_OFFSET
+      || fixp->fx_r_type == BFD_RELOC_ARM_T32_OFFSET_IMM)
     return 0;
 
   /* Always leave these relocations for the linker.  */
Index: gas/testsuite/gas/arm/ldr-pcrel-1.s
===================================================================
--- /dev/null	2011-02-21 12:47:04.267827113 +0000
+++ gas/testsuite/gas/arm/ldr-pcrel-1.s	2011-02-28 12:17:54.000000000 +0000
@@ -0,0 +1,45 @@
+	.macro	defsym,sym
+	.globl	g\sym
+g\sym:
+	.word	0
+	.word	0
+	.globl	\sym
+\sym:
+	.word	0
+	.word	0
+	.endm
+
+	.macro	ldrtest,ldr,ureg,sym
+	\ldr	r0,g\sym
+	\ldr	\ureg,\sym
+	\ldr	r0,g\sym
+	\ldr	\ureg,\sym
+	.endm
+
+	.macro	symtest,suffix,ureg,sym
+	ldrtest	ldrd, \ureg, \sym
+	ldrtest	ldr\suffix, \ureg, \sym
+	ldrtest	ldrh, \ureg, \sym
+	ldrtest	ldrsh, \ureg, \sym
+	ldrtest	ldrb, \ureg, \sym
+	ldrtest	ldrsb, \ureg, \sym
+	.endm
+
+	.syntax	unified
+	defsym	begin
+
+arm:
+	symtest	,r12,begin
+	symtest	,r12,middle
+
+	defsym	middle
+
+	.thumb_func
+thumb:
+	symtest	,r12,middle
+	symtest	,r12,end
+	symtest	.w,r12,middle
+	symtest	.w,r12,end
+	ldrtest	ldr.n,r7,end
+
+	defsym	end
Index: gas/testsuite/gas/arm/ldr-pcrel-1.d
===================================================================
--- /dev/null	2011-02-21 12:47:04.267827113 +0000
+++ gas/testsuite/gas/arm/ldr-pcrel-1.d	2011-02-28 12:17:54.000000000 +0000
@@ -0,0 +1,177 @@
+#objdump: -dr
+#name: PC-relative LDR 1
+
+.*
+
+
+Disassembly of section \.text:
+
+00000000 <gbegin>:
+	\.\.\.
+
+00000008 <begin>:
+	\.\.\.
+
+00000010 <arm>:
+  10:	e14f01d8 	ldrd	r0, \[pc, #-24\]	; 0 <gbegin>
+  14:	e14fc1d4 	ldrd	ip, \[pc, #-20\]	; 8 <begin>
+  18:	e14f02d0 	ldrd	r0, \[pc, #-32\]	; 0 <gbegin>
+  1c:	e14fc1dc 	ldrd	ip, \[pc, #-28\]	; 8 <begin>
+  20:	e51f0028 	ldr	r0, \[pc, #-40\]	; 0 <gbegin>
+  24:	e51fc024 	ldr	ip, \[pc, #-36\]	; 8 <begin>
+  28:	e51f0030 	ldr	r0, \[pc, #-48\]	; 0 <gbegin>
+  2c:	e51fc02c 	ldr	ip, \[pc, #-44\]	; 8 <begin>
+  30:	e15f03b8 	ldrh	r0, \[pc, #-56\]	; 0 <gbegin>
+  34:	e15fc3b4 	ldrh	ip, \[pc, #-52\]	; 8 <begin>
+  38:	e15f04b0 	ldrh	r0, \[pc, #-64\]	; 0 <gbegin>
+  3c:	e15fc3bc 	ldrh	ip, \[pc, #-60\]	; 8 <begin>
+  40:	e15f04f8 	ldrsh	r0, \[pc, #-72\]	; 0 <gbegin>
+  44:	e15fc4f4 	ldrsh	ip, \[pc, #-68\]	; 8 <begin>
+  48:	e15f05f0 	ldrsh	r0, \[pc, #-80\]	; 0 <gbegin>
+  4c:	e15fc4fc 	ldrsh	ip, \[pc, #-76\]	; 8 <begin>
+  50:	e55f0058 	ldrb	r0, \[pc, #-88\]	; 0 <gbegin>
+  54:	e55fc054 	ldrb	ip, \[pc, #-84\]	; 8 <begin>
+  58:	e55f0060 	ldrb	r0, \[pc, #-96\]	; 0 <gbegin>
+  5c:	e55fc05c 	ldrb	ip, \[pc, #-92\]	; 8 <begin>
+  60:	e15f06d8 	ldrsb	r0, \[pc, #-104\]	; 0 <gbegin>
+  64:	e15fc6d4 	ldrsb	ip, \[pc, #-100\]	; 8 <begin>
+  68:	e15f07d0 	ldrsb	r0, \[pc, #-112\]	; 0 <gbegin>
+  6c:	e15fc6dc 	ldrsb	ip, \[pc, #-108\]	; 8 <begin>
+  70:	e1cf05d8 	ldrd	r0, \[pc, #88\]	; d0 <gmiddle>
+  74:	e1cfc5dc 	ldrd	ip, \[pc, #92\]	; d8 <middle>
+  78:	e1cf05d0 	ldrd	r0, \[pc, #80\]	; d0 <gmiddle>
+  7c:	e1cfc5d4 	ldrd	ip, \[pc, #84\]	; d8 <middle>
+  80:	e59f0048 	ldr	r0, \[pc, #72\]	; d0 <gmiddle>
+  84:	e59fc04c 	ldr	ip, \[pc, #76\]	; d8 <middle>
+  88:	e59f0040 	ldr	r0, \[pc, #64\]	; d0 <gmiddle>
+  8c:	e59fc044 	ldr	ip, \[pc, #68\]	; d8 <middle>
+  90:	e1df03b8 	ldrh	r0, \[pc, #56\]	; d0 <gmiddle>
+  94:	e1dfc3bc 	ldrh	ip, \[pc, #60\]	; d8 <middle>
+  98:	e1df03b0 	ldrh	r0, \[pc, #48\]	; d0 <gmiddle>
+  9c:	e1dfc3b4 	ldrh	ip, \[pc, #52\]	; d8 <middle>
+  a0:	e1df02f8 	ldrsh	r0, \[pc, #40\]	; d0 <gmiddle>
+  a4:	e1dfc2fc 	ldrsh	ip, \[pc, #44\]	; d8 <middle>
+  a8:	e1df02f0 	ldrsh	r0, \[pc, #32\]	; d0 <gmiddle>
+  ac:	e1dfc2f4 	ldrsh	ip, \[pc, #36\]	; d8 <middle>
+  b0:	e5df0018 	ldrb	r0, \[pc, #24\]	; d0 <gmiddle>
+  b4:	e5dfc01c 	ldrb	ip, \[pc, #28\]	; d8 <middle>
+  b8:	e5df0010 	ldrb	r0, \[pc, #16\]	; d0 <gmiddle>
+  bc:	e5dfc014 	ldrb	ip, \[pc, #20\]	; d8 <middle>
+  c0:	e1df00d8 	ldrsb	r0, \[pc, #8\]	; d0 <gmiddle>
+  c4:	e1dfc0dc 	ldrsb	ip, \[pc, #12\]	; d8 <middle>
+  c8:	e1df00d0 	ldrsb	r0, \[pc\]	; d0 <gmiddle>
+  cc:	e1dfc0d4 	ldrsb	ip, \[pc, #4\]	; d8 <middle>
+
+000000d0 <gmiddle>:
+	\.\.\.
+
+000000d8 <middle>:
+	\.\.\.
+
+000000e0 <thumb>:
+  e0:	e95f 0105 	ldrd	r0, r1, \[pc, #-20\]
+  e4:	e95f cd04 	ldrd	ip, sp, \[pc, #-16\]
+  e8:	e95f 0107 	ldrd	r0, r1, \[pc, #-28\]
+  ec:	e95f cd06 	ldrd	ip, sp, \[pc, #-24\]
+  f0:	f85f 0024 	ldr\.w	r0, \[pc, #-36\]	; d0 <gmiddle>
+  f4:	f85f c020 	ldr\.w	ip, \[pc, #-32\]	; d8 <middle>
+  f8:	f85f 002c 	ldr\.w	r0, \[pc, #-44\]	; d0 <gmiddle>
+  fc:	f85f c028 	ldr\.w	ip, \[pc, #-40\]	; d8 <middle>
+ 100:	f83f 0034 	ldrh\.w	r0, \[pc, #-52\]	; d0 <gmiddle>
+ 104:	f83f c030 	ldrh\.w	ip, \[pc, #-48\]	; d8 <middle>
+ 108:	f83f 003c 	ldrh\.w	r0, \[pc, #-60\]	; d0 <gmiddle>
+ 10c:	f83f c038 	ldrh\.w	ip, \[pc, #-56\]	; d8 <middle>
+ 110:	f93f 0044 	ldrsh\.w	r0, \[pc, #-68\]	; d0 <gmiddle>
+ 114:	f93f c040 	ldrsh\.w	ip, \[pc, #-64\]	; d8 <middle>
+ 118:	f93f 004c 	ldrsh\.w	r0, \[pc, #-76\]	; d0 <gmiddle>
+ 11c:	f93f c048 	ldrsh\.w	ip, \[pc, #-72\]	; d8 <middle>
+ 120:	f81f 0054 	ldrb\.w	r0, \[pc, #-84\]	; d0 <gmiddle>
+ 124:	f81f c050 	ldrb\.w	ip, \[pc, #-80\]	; d8 <middle>
+ 128:	f81f 005c 	ldrb\.w	r0, \[pc, #-92\]	; d0 <gmiddle>
+ 12c:	f81f c058 	ldrb\.w	ip, \[pc, #-88\]	; d8 <middle>
+ 130:	f91f 0064 	ldrsb\.w	r0, \[pc, #-100\]	; d0 <gmiddle>
+ 134:	f91f c060 	ldrsb\.w	ip, \[pc, #-96\]	; d8 <middle>
+ 138:	f91f 006c 	ldrsb\.w	r0, \[pc, #-108\]	; d0 <gmiddle>
+ 13c:	f91f c068 	ldrsb\.w	ip, \[pc, #-104\]	; d8 <middle>
+ 140:	e9df 0148 	ldrd	r0, r1, \[pc, #288\]	; 0x120
+ 144:	e9df cd49 	ldrd	ip, sp, \[pc, #292\]	; 0x124
+ 148:	e9df 0146 	ldrd	r0, r1, \[pc, #280\]	; 0x118
+ 14c:	e9df cd47 	ldrd	ip, sp, \[pc, #284\]	; 0x11c
+ 150:	4844      	ldr	r0, \[pc, #272\]	; \(264 <gend>\)
+ 152:	f8df c118 	ldr\.w	ip, \[pc, #280\]	; 26c <end>
+ 156:	4843      	ldr	r0, \[pc, #268\]	; \(264 <gend>\)
+ 158:	f8df c110 	ldr\.w	ip, \[pc, #272\]	; 26c <end>
+ 15c:	f8bf 0104 	ldrh\.w	r0, \[pc, #260\]	; 264 <gend>
+ 160:	f8bf c108 	ldrh\.w	ip, \[pc, #264\]	; 26c <end>
+ 164:	f8bf 00fc 	ldrh\.w	r0, \[pc, #252\]	; 264 <gend>
+ 168:	f8bf c100 	ldrh\.w	ip, \[pc, #256\]	; 26c <end>
+ 16c:	f9bf 00f4 	ldrsh\.w	r0, \[pc, #244\]	; 264 <gend>
+ 170:	f9bf c0f8 	ldrsh\.w	ip, \[pc, #248\]	; 26c <end>
+ 174:	f9bf 00ec 	ldrsh\.w	r0, \[pc, #236\]	; 264 <gend>
+ 178:	f9bf c0f0 	ldrsh\.w	ip, \[pc, #240\]	; 26c <end>
+ 17c:	f89f 00e4 	ldrb\.w	r0, \[pc, #228\]	; 264 <gend>
+ 180:	f89f c0e8 	ldrb\.w	ip, \[pc, #232\]	; 26c <end>
+ 184:	f89f 00dc 	ldrb\.w	r0, \[pc, #220\]	; 264 <gend>
+ 188:	f89f c0e0 	ldrb\.w	ip, \[pc, #224\]	; 26c <end>
+ 18c:	f99f 00d4 	ldrsb\.w	r0, \[pc, #212\]	; 264 <gend>
+ 190:	f99f c0d8 	ldrsb\.w	ip, \[pc, #216\]	; 26c <end>
+ 194:	f99f 00cc 	ldrsb\.w	r0, \[pc, #204\]	; 264 <gend>
+ 198:	f99f c0d0 	ldrsb\.w	ip, \[pc, #208\]	; 26c <end>
+ 19c:	e95f 0134 	ldrd	r0, r1, \[pc, #-208\]	; 0xd0
+ 1a0:	e95f cd33 	ldrd	ip, sp, \[pc, #-204\]	; 0xcc
+ 1a4:	e95f 0136 	ldrd	r0, r1, \[pc, #-216\]	; 0xd8
+ 1a8:	e95f cd35 	ldrd	ip, sp, \[pc, #-212\]	; 0xd4
+ 1ac:	f85f 00e0 	ldr\.w	r0, \[pc, #-224\]	; d0 <gmiddle>
+ 1b0:	f85f c0dc 	ldr\.w	ip, \[pc, #-220\]	; d8 <middle>
+ 1b4:	f85f 00e8 	ldr\.w	r0, \[pc, #-232\]	; d0 <gmiddle>
+ 1b8:	f85f c0e4 	ldr\.w	ip, \[pc, #-228\]	; d8 <middle>
+ 1bc:	f83f 00f0 	ldrh\.w	r0, \[pc, #-240\]	; d0 <gmiddle>
+ 1c0:	f83f c0ec 	ldrh\.w	ip, \[pc, #-236\]	; d8 <middle>
+ 1c4:	f83f 00f8 	ldrh\.w	r0, \[pc, #-248\]	; d0 <gmiddle>
+ 1c8:	f83f c0f4 	ldrh\.w	ip, \[pc, #-244\]	; d8 <middle>
+ 1cc:	f93f 0100 	ldrsh\.w	r0, \[pc, #-256\]	; d0 <gmiddle>
+ 1d0:	f93f c0fc 	ldrsh\.w	ip, \[pc, #-252\]	; d8 <middle>
+ 1d4:	f93f 0108 	ldrsh\.w	r0, \[pc, #-264\]	; d0 <gmiddle>
+ 1d8:	f93f c104 	ldrsh\.w	ip, \[pc, #-260\]	; d8 <middle>
+ 1dc:	f81f 0110 	ldrb\.w	r0, \[pc, #-272\]	; d0 <gmiddle>
+ 1e0:	f81f c10c 	ldrb\.w	ip, \[pc, #-268\]	; d8 <middle>
+ 1e4:	f81f 0118 	ldrb\.w	r0, \[pc, #-280\]	; d0 <gmiddle>
+ 1e8:	f81f c114 	ldrb\.w	ip, \[pc, #-276\]	; d8 <middle>
+ 1ec:	f91f 0120 	ldrsb\.w	r0, \[pc, #-288\]	; d0 <gmiddle>
+ 1f0:	f91f c11c 	ldrsb\.w	ip, \[pc, #-284\]	; d8 <middle>
+ 1f4:	f91f 0128 	ldrsb\.w	r0, \[pc, #-296\]	; d0 <gmiddle>
+ 1f8:	f91f c124 	ldrsb\.w	ip, \[pc, #-292\]	; d8 <middle>
+ 1fc:	e9df 0119 	ldrd	r0, r1, \[pc, #100\]	; 0x64
+ 200:	e9df cd1a 	ldrd	ip, sp, \[pc, #104\]	; 0x68
+ 204:	e9df 0117 	ldrd	r0, r1, \[pc, #92\]	; 0x5c
+ 208:	e9df cd18 	ldrd	ip, sp, \[pc, #96\]	; 0x60
+ 20c:	f8df 0054 	ldr\.w	r0, \[pc, #84\]	; 264 <gend>
+ 210:	f8df c058 	ldr\.w	ip, \[pc, #88\]	; 26c <end>
+ 214:	f8df 004c 	ldr\.w	r0, \[pc, #76\]	; 264 <gend>
+ 218:	f8df c050 	ldr\.w	ip, \[pc, #80\]	; 26c <end>
+ 21c:	f8bf 0044 	ldrh\.w	r0, \[pc, #68\]	; 264 <gend>
+ 220:	f8bf c048 	ldrh\.w	ip, \[pc, #72\]	; 26c <end>
+ 224:	f8bf 003c 	ldrh\.w	r0, \[pc, #60\]	; 264 <gend>
+ 228:	f8bf c040 	ldrh\.w	ip, \[pc, #64\]	; 26c <end>
+ 22c:	f9bf 0034 	ldrsh\.w	r0, \[pc, #52\]	; 264 <gend>
+ 230:	f9bf c038 	ldrsh\.w	ip, \[pc, #56\]	; 26c <end>
+ 234:	f9bf 002c 	ldrsh\.w	r0, \[pc, #44\]	; 264 <gend>
+ 238:	f9bf c030 	ldrsh\.w	ip, \[pc, #48\]	; 26c <end>
+ 23c:	f89f 0024 	ldrb\.w	r0, \[pc, #36\]	; 264 <gend>
+ 240:	f89f c028 	ldrb\.w	ip, \[pc, #40\]	; 26c <end>
+ 244:	f89f 001c 	ldrb\.w	r0, \[pc, #28\]	; 264 <gend>
+ 248:	f89f c020 	ldrb\.w	ip, \[pc, #32\]	; 26c <end>
+ 24c:	f99f 0014 	ldrsb\.w	r0, \[pc, #20\]	; 264 <gend>
+ 250:	f99f c018 	ldrsb\.w	ip, \[pc, #24\]	; 26c <end>
+ 254:	f99f 000c 	ldrsb\.w	r0, \[pc, #12\]	; 264 <gend>
+ 258:	f99f c010 	ldrsb\.w	ip, \[pc, #16\]	; 26c <end>
+ 25c:	4801      	ldr	r0, \[pc, #4\]	; \(264 <gend>\)
+ 25e:	4f03      	ldr	r7, \[pc, #12\]	; \(26c <end>\)
+ 260:	4800      	ldr	r0, \[pc, #0\]	; \(264 <gend>\)
+ 262:	4f02      	ldr	r7, \[pc, #8\]	; \(26c <end>\)
+
+00000264 <gend>:
+	\.\.\.
+
+0000026c <end>:
+	\.\.\.
