diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d1241cbb82c6d6ea93cf2c947849519ce0f76ed2..17cc226cdd48e4f1844de295f5e200818d8759b1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-20  Olivier Hainque  <hainque@adacore.com>
+
+	* config/rs6000/rs6000.c (rs6000_reg_live_or_pic_offset_p):
+	If the current function calls eh_return, claim live all registers
+	that we need to check for liveness otherwise.
+
 2010-10-20  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* c-decl.c (c_write_global_declarations): Call
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 69c3969b451680ef296c38fd01448cf7adb16856..9469d45c10ee20ce2701eaa85650a8dc61135784 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -19690,7 +19690,12 @@ rs6000_make_savres_rtx (rs6000_stack_t *info,
 static bool
 rs6000_reg_live_or_pic_offset_p (int reg)
 {
-  return ((df_regs_ever_live_p (reg)
+  /* If the function calls eh_return, claim used all the registers that would
+     be checked for liveness otherwise.  This is required for the PIC offset
+     register with -mminimal-toc on AIX, as it is advertised as "fixed" for
+     register allocation purposes in this case.  */
+
+  return (((crtl->calls_eh_return || df_regs_ever_live_p (reg))
            && (!call_used_regs[reg]
                || (reg == RS6000_PIC_OFFSET_TABLE_REGNUM
                    && TARGET_TOC && TARGET_MINIMAL_TOC)))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f777c3f157e48280d5a014a120e4d548dee8c36d..cd270458773a5b5b6b0df68b26f015e0344bff99 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-20  Olivier Hainque  <hainque@adacore.com>
+
+	* gcc.target/powerpc/ehreturn.c: New test.
+
 2010-10-20  Nicola Pero  <nicola.pero@meta-innovation.com>
 	
 	Merge from 'apple/trunk' branch on FSF servers.  Test adapted to
diff --git a/gcc/testsuite/gcc.target/powerpc/ehreturn.c b/gcc/testsuite/gcc.target/powerpc/ehreturn.c
new file mode 100644
index 0000000000000000000000000000000000000000..ff286f66279171c150fb5f5423ce6fa0f14f029a
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/ehreturn.c
@@ -0,0 +1,15 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -mminimal-toc -mno-multiple" } */
+/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
+
+void foo ()
+{
+  long l; void *p;
+  volatile int x;
+
+  __builtin_unwind_init ();
+  x = 12;
+  __builtin_eh_return (l, p);
+}
+
+/* { dg-final { scan-assembler "st\\[wd\\] 30," } } */