diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 49b84380490..1fad63688e7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-16  David S. Miller  <davem@davemloft.net>
+
+	* lra-constraints.c (simplify_operand_subreg): Do not assume that
+	lowpart of a SUBREG has offset zero.
+
 2015-09-16  Jeff Law  <law@redhat.com>
 
 	PR tree-optimization/47679
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index cdb2695acfa..fc8e43d66d9 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -1545,7 +1545,7 @@ simplify_operand_subreg (int nop, machine_mode reg_mode)
 	  bool insert_before, insert_after;
 
 	  PUT_MODE (new_reg, mode);
-          subreg = simplify_gen_subreg (innermode, new_reg, mode, 0);
+          subreg = gen_lowpart_SUBREG (innermode, new_reg);
 	  bitmap_set_bit (&lra_subreg_reload_pseudos, REGNO (new_reg));
 
 	  insert_before = (type != OP_OUT);