diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e6d68f92754..d77ae3e67df 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-04  Richard Earnshaw  <rearnsha@arm.com>
+
+	* arm.c (thumb_legitimate_addres_p): Allow any constant offset
+	from the soft-frame, argument and virtual registers.
+
 2006-11-04  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.md (*movxf_nointeger, *movxf_integer): Enable
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 6527f5556da..4342c4682f2 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -3799,7 +3799,10 @@ thumb_legitimate_address_p (enum machine_mode mode, rtx x, int strict_p)
 	return 1;
 
       else if (GET_CODE (XEXP (x, 0)) == REG
-	       && REGNO (XEXP (x, 0)) == FRAME_POINTER_REGNUM
+	       && (REGNO (XEXP (x, 0)) == FRAME_POINTER_REGNUM
+		   || REGNO (XEXP (x, 0)) == ARG_POINTER_REGNUM
+		   || (REGNO (XEXP (x, 0)) >= FIRST_VIRTUAL_REGISTER
+		       && REGNO (XEXP (x, 0)) <= LAST_VIRTUAL_REGISTER))
 	       && GET_MODE_SIZE (mode) >= 4
 	       && GET_CODE (XEXP (x, 1)) == CONST_INT
 	       && (INTVAL (XEXP (x, 1)) & 3) == 0)