diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 10a9bc9debf..36ee6905d0a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-27  Jakub Jelinek  <jakub@redhat.com>
 
+	* config/s390/s390.c (s390_delegitimize_address): Call
+	delegitimize_mem_from_attrs.
+
 	PR middle-end/42874
 	* tree-inline.c (cannot_copy_type_1): Removed.
 	(copy_forbidden): Don't forbid copying of functions containing
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 28cf2eb92a0..17c6a23d853 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -4762,8 +4762,10 @@ s390_mangle_type (const_tree type)
 static rtx
 s390_delegitimize_address (rtx orig_x)
 {
-  rtx x = orig_x, y;
+  rtx x, y;
 
+  orig_x = delegitimize_mem_from_attrs (orig_x);
+  x = orig_x;
   if (GET_CODE (x) != MEM)
     return orig_x;