summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/emit-rtl.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1b47598ca6b..23fcd05c4f4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-20 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
+
+ * emit-rtl.c (set_mem_attributes_minus_bitpos): Restore setting
+ memory address space to the type's address space.
+
2011-07-20 Georg-Johann Lay <avr@gjlay.de>
PR target/36467
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index c34e6d52ad4..f1b8eb93daf 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -1845,6 +1845,7 @@ set_mem_attributes_minus_bitpos (rtx ref, tree t, int objectp,
}
/* Now set the attributes we computed above. */
+ attrs.addrspace = TYPE_ADDR_SPACE (type);
set_mem_attrs (ref, &attrs);
/* If this is already known to be a scalar or aggregate, we are done. */