aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Saunders <tbsaunde+gcc@tbsaunde.org>2015-10-11 00:48:22 +0000
committerTrevor Saunders <tbsaunde@gcc.gnu.org>2015-10-11 00:48:22 +0000
commit38b0b09304b5b87eb69fa1ddfbafbc500aacb315 (patch)
treeb5070ceb5915eb496679c16f7a22e89a1fcb2404
parenta9e0a99876e03cb3fedcded38d442fe53b185a84 (diff)
downloadgcc-38b0b09304b5b87eb69fa1ddfbafbc500aacb315.zip
gcc-38b0b09304b5b87eb69fa1ddfbafbc500aacb315.tar.gz
gcc-38b0b09304b5b87eb69fa1ddfbafbc500aacb315.tar.bz2
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
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/builtins.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ab61ec2..4bf73e4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
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.
* builtins.c (expand_builtin_return_addr): Adjust.
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 65aa71f..b4ac535 100644
--- 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));