diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 78c0790f778..34560ae6745 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-23  Jiong Wang  <jiong.wang@arm.com>
+
+	* config/aarch64/aarch64.c
+	(aarch64_save_or_restore_callee_save_registers)
+	(aarch64_save_or_restore_fprs): Remove base_rtx.
+
 2014-07-23  Jiong Wang  <jiong.wang@arm.com>
 
 	* config/aarch64/aarch64.c
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index e270d99be1c..6c71dccd0ab 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -1911,7 +1911,7 @@ aarch64_register_saved_on_entry (int regno)
 
 static void
 aarch64_save_or_restore_fprs (HOST_WIDE_INT start_offset, int increment,
-			      bool restore, rtx base_rtx)
+			      bool restore)
 
 {
   unsigned regno;
@@ -1927,7 +1927,7 @@ aarch64_save_or_restore_fprs (HOST_WIDE_INT start_offset, int increment,
 	  rtx mem;
 	  mem = gen_mem_ref (DFmode,
 			     plus_constant (Pmode,
-					    base_rtx,
+					    stack_pointer_rtx,
 					    start_offset));
 
 	  for (regno2 = regno + 1;
@@ -1947,7 +1947,7 @@ aarch64_save_or_restore_fprs (HOST_WIDE_INT start_offset, int increment,
 	      mem2 = gen_mem_ref (DFmode,
 				  plus_constant
 				  (Pmode,
-				   base_rtx,
+				   stack_pointer_rtx,
 				   start_offset + increment));
 	      if (restore == false)
 		{
@@ -2001,7 +2001,6 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT start_offset,
 					       bool restore)
 {
   rtx insn;
-  rtx base_rtx = stack_pointer_rtx;
   HOST_WIDE_INT increment = UNITS_PER_WORD;
   rtx (*gen_mem_ref) (enum machine_mode, rtx) = (frame_pointer_needed
 						 ? gen_frame_mem : gen_rtx_MEM);
@@ -2016,7 +2015,7 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT start_offset,
 	  rtx mem;
 	  mem = gen_mem_ref (Pmode,
 			     plus_constant (Pmode,
-					    base_rtx,
+					    stack_pointer_rtx,
 					    start_offset));
 
 	  for (regno2 = regno + 1;
@@ -2035,7 +2034,7 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT start_offset,
 	      mem2 = gen_mem_ref (Pmode,
 				  plus_constant
 				  (Pmode,
-				   base_rtx,
+				   stack_pointer_rtx,
 				   start_offset + increment));
 	      if (restore == false)
 		{
@@ -2080,7 +2079,7 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT start_offset,
 	}
     }
 
-  aarch64_save_or_restore_fprs (start_offset, increment, restore, base_rtx);
+  aarch64_save_or_restore_fprs (start_offset, increment, restore);
 }
 
 /* AArch64 stack frames generated by this compiler look like: