diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4711095729f..ff0e2c0bdf3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-19  Ian Bolton  <ian.bolton@arm.com>
+
+	PR target/45070
+	* config/arm/arm.c (arm_output_epilogue): Ensure that return
+	 value of size 1-3 is handled correctly.
+
 2010-08-19  Ian Bolton  <ian.bolton@arm.com>
 
 	* tree-switch-conversion.c (gen_inbound_check): Ensure that the
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index f6148a7309d..5ed16a8a76e 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -14467,7 +14467,8 @@ arm_output_epilogue (rtx sibling)
 		  && !crtl->tail_call_emit)
 		{
 		  unsigned long mask;
-		  mask = (1 << (arm_size_return_regs() / 4)) - 1;
+                  /* Preserve return values, of any size.  */
+		  mask = (1 << ((arm_size_return_regs() + 3) / 4)) - 1;
 		  mask ^= 0xf;
 		  mask &= ~saved_regs_mask;
 		  reg = 0;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index afd8b999f6c..f4d145a1591 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-19  Ian Bolton  <ian.bolton@arm.com>
+
+	PR target/45070
+	* gcc.c-torture/execute/pr45070.c: New.
+
 2010-08-19  Ian Bolton  <ian.bolton@arm.com>
 
 	* g++.dg/pr44328.C: New test.
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr45070.c b/gcc/testsuite/gcc.c-torture/execute/pr45070.c
new file mode 100644
index 00000000000..95ff77aa0b0
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr45070.c
@@ -0,0 +1,52 @@
+/* PR45070 */
+extern void abort(void);
+
+struct packed_ushort {
+    unsigned short ucs;
+} __attribute__((packed));
+
+struct source {
+    int pos, length;
+    int flag;
+};
+
+static void __attribute__((noinline)) fetch(struct source *p)
+{
+    p->length = 128;
+}
+    
+static struct packed_ushort __attribute__((noinline)) next(struct source *p)
+{
+    struct packed_ushort rv;
+
+    if (p->pos >= p->length) {
+	if (p->flag) {
+	    p->flag = 0;
+	    fetch(p);
+	    return next(p);
+	}
+	p->flag = 1;
+	rv.ucs = 0xffff;
+	return rv;
+    }
+    rv.ucs = 0;
+    return rv;
+}
+
+int main(void)
+{
+    struct source s;
+    int i;
+
+    s.pos = 0;
+    s.length = 0;
+    s.flag = 0;
+
+    for (i = 0; i < 16; i++) {
+	struct packed_ushort rv = next(&s);
+	if ((i == 0 && rv.ucs != 0xffff)
+	    || (i > 0 && rv.ucs != 0))
+	    abort();
+    }
+    return 0;
+}