IA MCU psABI support: changes to libraries

[gcc.git] / gcc / cfgrtl.c

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 13f8372735ef72a697cf9c3f36d343ca5bfbd86f..2e33dda2f81581062ad411a7234e54e5e4110dfe 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -41,16 +41,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
-#include "inchash.h"
 #include "tree.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "hashtab.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -69,7 +64,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "insn-attr.h"
 #include "insn-config.h"
 #include "rtl.h"
-#include "statistics.h"
 #include "expmed.h"
 #include "dojump.h"
 #include "explow.h"
@@ -81,7 +75,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "common/common-target.h"
 #include "cfgloop.h"
-#include "ggc.h"
 #include "tree-pass.h"
 #include "df.h"
 
@@ -1702,19 +1695,12 @@ force_nonfallthru_and_redirect (edge e, basic_block target, rtx jump_label)
   if (target == EXIT_BLOCK_PTR_FOR_FN (cfun))
     {
       if (jump_label == ret_rtx)
-       {
-         if (!HAVE_return)
-           gcc_unreachable ();
-
-         emit_jump_insn_after_setloc (gen_return (), BB_END (jump_block), loc);
-       }
+       emit_jump_insn_after_setloc (targetm.gen_return (),
+                                    BB_END (jump_block), loc);
       else
        {
          gcc_assert (jump_label == simple_return_rtx);
-         if (!HAVE_simple_return)
-           gcc_unreachable ();
-
-         emit_jump_insn_after_setloc (gen_simple_return (),
+         emit_jump_insn_after_setloc (targetm.gen_simple_return (),
                                       BB_END (jump_block), loc);
        }
       set_return_jump_label (BB_END (jump_block));