remove unneeded #if for HARD_FRAME_POINTER_IS_ARG_POINTER

gcc/ChangeLog:

2015-10-10  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* builtins.c (expand_builtin_setjmp_receiver): Don't use #if to
	check HARD_FRAME_POINTER_IS_ARG_POINTER.

From-SVN: r228689

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ab61ec2e553e91829f7ba847fe2ae99ca83c8fcb..4bf73e465bf3a57016682dd61410f38720185279 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-10  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+       * builtins.c (expand_builtin_setjmp_receiver): Don't use #if to
+       check HARD_FRAME_POINTER_IS_ARG_POINTER.
+
 2015-10-10  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
        * defaults.h (FRAME_ADDR_RTX): New default definition.

diff --git a/gcc/builtins.c b/gcc/builtins.c
index 65aa71f659d9e26de1812ad19b296a9b06b93d01..b4ac53553fe47c1ba8b17e17e455b2f87efa191b 100644 (file)
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -915,8 +915,7 @@ expand_builtin_setjmp_receiver (rtx receiver_label)
       emit_clobber (hard_frame_pointer_rtx);
     }
 
-#if !HARD_FRAME_POINTER_IS_ARG_POINTER
-  if (fixed_regs[ARG_POINTER_REGNUM])
+  if (!HARD_FRAME_POINTER_IS_ARG_POINTER && fixed_regs[ARG_POINTER_REGNUM])
     {
 #ifdef ELIMINABLE_REGS
       /* If the argument pointer can be eliminated in favor of the
@@ -941,7 +940,6 @@ expand_builtin_setjmp_receiver (rtx receiver_label)
                          copy_to_reg (get_arg_pointer_save_area ()));
        }
     }
-#endif
 
   if (receiver_label != NULL && targetm.have_builtin_setjmp_receiver ())
     emit_insn (targetm.gen_builtin_setjmp_receiver (receiver_label));