diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f3369639fa4..04fa53e0bce 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-05  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+	* expr.c (expand_expr, case COMPONENT_REF): When seeing if should use 
+	bitfield operations, use STRICT_ALIGNMENT, not SLOW_UNALIGNED_ACCESS
+	if EXPAND_CONST_ADDRESS or EXPAND_INITIALIZER.
+
 2003-07-05  Andreas Jaeger  <aj@suse.de>
 
 	* genattrtab.c (write_attr_get): Revert part of last patch to
diff --git a/gcc/expr.c b/gcc/expr.c
index 56d733f2d0f..88374f35ee3 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -7541,7 +7541,10 @@ expand_expr (tree exp, rtx target, enum machine_mode tmode, enum expand_modifier
 	    || (mode1 != BLKmode
 		&& (((TYPE_ALIGN (TREE_TYPE (tem)) < GET_MODE_ALIGNMENT (mode)
 		      || (bitpos % GET_MODE_ALIGNMENT (mode) != 0))
-		     && SLOW_UNALIGNED_ACCESS (mode1, MEM_ALIGN (op0)))
+		     && ((modifier == EXPAND_CONST_ADDRESS
+			  || modifier == EXPAND_INITIALIZER)
+			 ? STRICT_ALIGNMENT
+			 : SLOW_UNALIGNED_ACCESS (mode1, MEM_ALIGN (op0))))
 		    || (bitpos % BITS_PER_UNIT != 0)))
 	    /* If the type and the field are a constant size and the
 	       size of the type isn't the same size as the bitfield,