bb-reorder.c (fix_crossing_conditional_branches): Fix bootstrap failure on solaris.

2004-04-11  Andreas Tobler  <a.tobler@schweiz.ch>

	* bb-reorder.c (fix_crossing_conditional_branches): Fix bootstrap
	failure on solaris. Place ifdef HAVE_return around gen_ret call.
	* cfgrtl.c (force_nonfallthru_and_redirect): Remove ifdef
	HAVE_return and place it around the place where it is needed.

From-SVN: r80594

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 839e6483e554a951ead7331989976c56a5eaf400..6c446a74f4c81be03c3d127a323c860e501ba3e4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-11  Andreas Tobler  <a.tobler@schweiz.ch>
+
+       * bb-reorder.c (fix_crossing_conditional_branches): Fix bootstrap
+       failure on solaris. Place ifdef HAVE_return around gen_ret call.
+       * cfgrtl.c (force_nonfallthru_and_redirect): Remove ifdef
+       HAVE_return and place it around the place where it is needed.
+
 2004-04-11  Andrew Pinski  <pinskia@physics.uc.edu>
 
        * varasm.c (text_section): Use TEXT_SECTION_ASM_OP and

diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index ae335c1d74bc7260183acbb4027514c5c6588ca7..022cb33eb2eb78b1f9149e7ec160fddae2d0c0d1 100644 (file)
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -1684,9 +1684,11 @@ fix_crossing_conditional_branches (void)
                                                       (old_label), 
                                                       BB_END (new_bb));
                    }
+#ifdef HAVE_return
                  else if (GET_CODE (old_label) == RETURN)
                    new_jump = emit_jump_insn_after (gen_return (), 
                                                     BB_END (new_bb));
+#endif
                  else
                    abort ();
                  

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 2e09ba2055dd9b5d81bc0f16b35639c67fdb0703..461eb34a6f725246102944b64148604c2c9f26c0 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -57,11 +57,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "cfglayout.h"
 #include "expr.h"
 
-/* Stubs in case we don't have a return insn.  */
-#ifndef HAVE_return
-#define HAVE_return 0
-#define gen_return() NULL_RTX
-#endif
 
 /* The labels mentioned in non-jump rtl.  Valid during find_basic_blocks.  */
 /* ??? Should probably be using LABEL_NUSES instead.  It would take a
@@ -1134,10 +1129,11 @@ force_nonfallthru_and_redirect (edge e, basic_block target)
   e->flags &= ~EDGE_FALLTHRU;
   if (target == EXIT_BLOCK_PTR)
     {
-      if (HAVE_return)
+#ifdef HAVE_return
        emit_jump_insn_after (gen_return (), BB_END (jump_block));
-      else
+#else
        abort ();
+#endif
     }
   else
     {