[llvm-commits] [llvm-gcc-4.2] r51260 - /llvm-gcc-4.2/trunk/gcc/passes.c

[Devang Patel]

Author: dpatel
Date: Mon May 19 13:33:34 2008
New Revision: 51260

URL: http://llvm.org/viewvc/llvm-project?rev=51260&view=rev
Log:
Revert previous two patches. This fixes undefined symbols error reported during bootstrap. Now I'm able to make further progress on bootstrap.

Modified:
    llvm-gcc-4.2/trunk/gcc/passes.c

Modified: llvm-gcc-4.2/trunk/gcc/passes.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/passes.c?rev=51260&r1=51259&r2=51260&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/passes.c (original)
+++ llvm-gcc-4.2/trunk/gcc/passes.c Mon May 19 13:33:34 2008
@@ -481,20 +481,18 @@
 #define NEXT_PASS(PASS)  (p = next_pass_1 (p, &PASS))
   /* Interprocedural optimization passes.  */
   p = &all_ipa_passes;
-  /* LLVM local begin */
-#ifndef ENABLE_LLVM
   NEXT_PASS (pass_early_ipa_inline);
   NEXT_PASS (pass_early_local_passes);
   NEXT_PASS (pass_ipa_cp);
-#endif
-  NEXT_PASS (pass_ipa_inline); /* LLVM: inline functions marked always_inline */
+  NEXT_PASS (pass_ipa_inline);
+/* LLVM LOCAL begin */
 #ifndef ENABLE_LLVM
   NEXT_PASS (pass_ipa_reference);
   NEXT_PASS (pass_ipa_pure_const); 
   NEXT_PASS (pass_ipa_type_escape);
   NEXT_PASS (pass_ipa_pta);
 #endif
-  /* LLVM local end */
+/* LLVM LOCAL end */
   *p = NULL;
 
   /* All passes needed to lower the function into shape optimizers can
@@ -506,9 +504,9 @@
   NEXT_PASS (pass_lower_cf);
   NEXT_PASS (pass_lower_eh);
   NEXT_PASS (pass_build_cfg);
+  NEXT_PASS (pass_lower_complex_O0);
   /* LLVM LOCAL begin */
 #ifndef ENABLE_LLVM
-  NEXT_PASS (pass_lower_complex_O0);
   NEXT_PASS (pass_lower_vector);
 #endif
   /* LLVM LOCAL end */
@@ -520,6 +518,16 @@
   /* LLVM LOCAL end */
   *p = NULL;
 
+  p = &pass_early_local_passes.sub;
+  /* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
+  NEXT_PASS (pass_tree_profile);
+#endif
+  /* LLVM LOCAL end */
+  NEXT_PASS (pass_cleanup_cfg);
+  NEXT_PASS (pass_rebuild_cgraph_edges);
+  *p = NULL;
+
   /* LLVM LOCAL begin */
 #ifdef ENABLE_LLVM
   p = &all_extra_lowering_passes;
@@ -531,12 +539,6 @@
 #endif
   /* LLVM LOCAL end */
 
-  p = &pass_early_local_passes.sub;
-  NEXT_PASS (pass_tree_profile);
-  NEXT_PASS (pass_cleanup_cfg);
-  NEXT_PASS (pass_rebuild_cgraph_edges);
-  *p = NULL;
-
   p = &all_passes;
   NEXT_PASS (pass_fixup_cfg);
   NEXT_PASS (pass_init_datastructures);
@@ -682,6 +684,8 @@
   NEXT_PASS (pass_dce_loop);
   *p = NULL;
 
+  /* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
   p = &pass_loop2.sub;
   NEXT_PASS (pass_rtl_loop_init);
   NEXT_PASS (pass_rtl_move_loop_invariants);
@@ -756,6 +760,8 @@
   NEXT_PASS (pass_set_nothrow_function_flags);
   NEXT_PASS (pass_final);
   *p = NULL;
+#endif
+  /* LLVM LOCAL end */
 
 #undef NEXT_PASS