diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fcf9e3d074e3..f87e063d216b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-08  Steve Ellcey  <sje@cup.hp.com>
+
+	* stmt.c (expand_stack_restore): Change sa mode if needed.
+
 2008-05-08  Richard Guenther  <rguenther@suse.de>
 
 	* config/i386/i386-protos.h (ix86_return_in_memory): Adjust
diff --git a/gcc/stmt.c b/gcc/stmt.c
index ba4c49d4d879..4dba88196cfa 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -1996,6 +1996,7 @@ expand_stack_restore (tree var)
 {
   rtx sa = expand_normal (var);
 
+  sa = convert_memory_address (Pmode, sa);
   emit_stack_restore (SAVE_BLOCK, sa, NULL_RTX);
 }