diff --git a/lib/Target/ARM/ARMFastISel.cpp b/lib/Target/ARM/ARMFastISel.cpp
index d3303671255..432abb500ce 100644
--- a/lib/Target/ARM/ARMFastISel.cpp
+++ b/lib/Target/ARM/ARMFastISel.cpp
@@ -875,8 +875,7 @@ void ARMFastISel::ARMSimplifyAddress(Address &Addr, EVT VT, bool useAM3) {
         needsLowering = ((Addr.Offset & 0xfff) != Addr.Offset);
       else
         // ARM halfword load/stores and signed byte loads use +/-imm8 offsets.
-        // FIXME: Negative offsets require special handling.
-        needsLowering = (Addr.Offset > 255 || Addr.Offset < 0);
+        needsLowering = (Addr.Offset > 255 || Addr.Offset < -255);
       break;
     case MVT::f32:
     case MVT::f64:
@@ -933,18 +932,26 @@ void ARMFastISel::AddLoadStoreOperands(EVT VT, Address &Addr,
     MIB.addFrameIndex(FI);
 
     // ARM halfword load/stores and signed byte loads need an additional operand.
-    if (useAM3) MIB.addReg(0);
-
-    MIB.addImm(Addr.Offset);
+    if (useAM3) {
+      signed Imm = (Addr.Offset < 0) ? (0x100 | -Addr.Offset) : Addr.Offset;
+      MIB.addReg(0);
+      MIB.addImm(Imm);
+    } else {
+      MIB.addImm(Addr.Offset);
+    }
     MIB.addMemOperand(MMO);
   } else {
     // Now add the rest of the operands.
     MIB.addReg(Addr.Base.Reg);
 
     // ARM halfword load/stores and signed byte loads need an additional operand.
-    if (useAM3) MIB.addReg(0);
-
-    MIB.addImm(Addr.Offset);
+    if (useAM3) {
+      signed Imm = (Addr.Offset < 0) ? (0x100 | -Addr.Offset) : Addr.Offset;
+      MIB.addReg(0);
+      MIB.addImm(Imm);
+    } else {
+      MIB.addImm(Addr.Offset);
+    }
   }
   AddOptionalDefs(MIB);
 }
diff --git a/test/CodeGen/ARM/fast-isel-ldrh-strh-arm.ll b/test/CodeGen/ARM/fast-isel-ldrh-strh-arm.ll
index 62c6e0ce4d5..dcfc9d0ea51 100644
--- a/test/CodeGen/ARM/fast-isel-ldrh-strh-arm.ll
+++ b/test/CodeGen/ARM/fast-isel-ldrh-strh-arm.ll
@@ -1,48 +1,33 @@
 ; RUN: llc < %s -O0 -fast-isel-abort -relocation-model=dynamic-no-pic -mtriple=armv7-apple-darwin | FileCheck %s --check-prefix=ARM
 ; rdar://10418009
 
-; TODO: We currently don't support ldrh/strh for negative offsets.  Likely a 
-; rare case, but possibly worth pursuing.  Comments above the test case show
-; what could be selected.
-
-; ldrh r0, [r0, #-16]
 define zeroext i16 @t1(i16* nocapture %a) nounwind uwtable readonly ssp {
 entry:
 ; ARM: t1
   %add.ptr = getelementptr inbounds i16* %a, i64 -8
   %0 = load i16* %add.ptr, align 2
-; ARM: mvn r{{[1-9]}}, #15
-; ARM: add r0, r0, r{{[1-9]}}
-; ARM: ldrh r0, [r0]
+; ARM: ldrh r0, [r0, #-16]
   ret i16 %0
 }
 
-; ldrh r0, [r0, #-32]
 define zeroext i16 @t2(i16* nocapture %a) nounwind uwtable readonly ssp {
 entry:
 ; ARM: t2
   %add.ptr = getelementptr inbounds i16* %a, i64 -16
   %0 = load i16* %add.ptr, align 2
-; ARM: mvn r{{[1-9]}}, #31
-; ARM: add r0, r0, r{{[1-9]}}
-; ARM: ldrh r0, [r0]
+; ARM: ldrh r0, [r0, #-32]
   ret i16 %0
 }
 
-; ldrh r0, [r0, #-254]
 define zeroext i16 @t3(i16* nocapture %a) nounwind uwtable readonly ssp {
 entry:
 ; ARM: t3
   %add.ptr = getelementptr inbounds i16* %a, i64 -127
   %0 = load i16* %add.ptr, align 2
-; ARM: mvn r{{[1-9]}}, #253
-; ARM: add r0, r0, r{{[1-9]}}
-; ARM: ldrh r0, [r0]
+; ARM: ldrh r0, [r0, #-254]
   ret i16 %0
 }
 
-; mvn r1, #255
-; ldrh r0, [r0, r1]
 define zeroext i16 @t4(i16* nocapture %a) nounwind uwtable readonly ssp {
 entry:
 ; ARM: t4
@@ -91,15 +76,12 @@ entry:
   ret i16 %0
 }
 
-; strh r1, [r0, #-16]
 define void @t9(i16* nocapture %a) nounwind uwtable ssp {
 entry:
 ; ARM: t9
   %add.ptr = getelementptr inbounds i16* %a, i64 -8
   store i16 0, i16* %add.ptr, align 2
-; ARM: mvn r{{[1-9]}}, #15
-; ARM: add r0, r0, r{{[1-9]}}
-; ARM: strh r{{[1-9]}}, [r0]
+; ARM: strh	r1, [r0, #-16]
   ret void
 }
 
@@ -136,3 +118,32 @@ entry:
 ; ARM: strh r{{[1-9]}}, [r0]
   ret void
 }
+
+define signext i8 @t13(i8* nocapture %a) nounwind uwtable readonly ssp {
+entry:
+; ARM: t13
+  %add.ptr = getelementptr inbounds i8* %a, i64 -8
+  %0 = load i8* %add.ptr, align 2
+; ARM: ldrsb r0, [r0, #-8]
+  ret i8 %0
+}
+
+define signext i8 @t14(i8* nocapture %a) nounwind uwtable readonly ssp {
+entry:
+; ARM: t14
+  %add.ptr = getelementptr inbounds i8* %a, i64 -255
+  %0 = load i8* %add.ptr, align 2
+; ARM: ldrsb r0, [r0, #-255]
+  ret i8 %0
+}
+
+define signext i8 @t15(i8* nocapture %a) nounwind uwtable readonly ssp {
+entry:
+; ARM: t15
+  %add.ptr = getelementptr inbounds i8* %a, i64 -256
+  %0 = load i8* %add.ptr, align 2
+; ARM: mvn r{{[1-9]}}, #255
+; ARM: add r0, r0, r{{[1-9]}}
+; ARM: ldrsb r0, [r0]
+  ret i8 %0
+}