summaryrefslogtreecommitdiff
path: root/gcc/except.c
diff options
context:
space:
mode:
authorTrevor Saunders <tbsaunde+gcc@tbsaunde.org>2015-11-15 00:18:01 +0000
committerTrevor Saunders <tbsaunde@gcc.gnu.org>2015-11-15 00:18:01 +0000
commitdd4fb6097ad6c16af5ba806c56513e5d756ab852 (patch)
tree188a369c272c1a7ac81ed20762dcfe4179b01bc7 /gcc/except.c
parentab7b56730bc193083d0a778b79ca5be0390e17d5 (diff)
always define EH_RETURN_HANDLER_RTX
gcc/ChangeLog: 2015-11-14 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> * defaults.h (EH_RETURN_HANDLER_RTX): New default definition. * df-scan.c (df_get_exit_block_use_set): Adjust. * except.c (expand_eh_return): Likewise. From-SVN: r230392
Diffstat (limited to 'gcc/except.c')
-rw-r--r--gcc/except.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/gcc/except.c b/gcc/except.c
index 1801fe726d1..1a41a34cd04 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -2255,11 +2255,10 @@ expand_eh_return (void)
emit_insn (targetm.gen_eh_return (crtl->eh.ehr_handler));
else
{
-#ifdef EH_RETURN_HANDLER_RTX
- emit_move_insn (EH_RETURN_HANDLER_RTX, crtl->eh.ehr_handler);
-#else
- error ("__builtin_eh_return not supported on this target");
-#endif
+ if (rtx handler = EH_RETURN_HANDLER_RTX)
+ emit_move_insn (handler, crtl->eh.ehr_handler);
+ else
+ error ("__builtin_eh_return not supported on this target");
}
emit_label (around_label);