[llvm-commits] [llvm-gcc-4.2] r54183 - in /llvm-gcc-4.2/trunk/gcc: builtins.c c-incpath.c passes.c

[Bill Wendling]

Author: void
Date: Tue Jul 29 18:52:44 2008
New Revision: 54183

URL: http://llvm.org/viewvc/llvm-project?rev=54183&view=rev
Log:
Merges from Apple's GCC 4.2 r148430

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

Modified: llvm-gcc-4.2/trunk/gcc/builtins.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/builtins.c?rev=54183&r1=54182&r2=54183&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/builtins.c (original)
+++ llvm-gcc-4.2/trunk/gcc/builtins.c Tue Jul 29 18:52:44 2008
@@ -71,8 +71,12 @@
    required to implement the function call in all cases).  */
 tree implicit_built_in_decls[(int) END_BUILTINS];
 
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
+static
+#endif
 int get_pointer_alignment (tree, unsigned int);
+/* LLVM LOCAL end */
 static const char *c_getstr (tree);
 static rtx c_readstr (const char *, enum machine_mode);
 static int target_char_cast (tree, char *);
@@ -141,6 +145,9 @@
 static tree fold_builtin_inf (tree, int);
 static tree fold_builtin_nan (tree, tree, int);
 /* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
+static
+#endif
 int validate_arglist (tree, ...);
 /* LLVM LOCAL end */
 static bool integer_valued_real_p (tree);
@@ -232,8 +239,12 @@
    Otherwise, look at the expression to see if we can do better, i.e., if the
    expression is actually pointing at an object whose alignment is tighter.  */
 
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
+static
+#endif
 int
+/* LLVM LOCAL end */
 get_pointer_alignment (tree exp, unsigned int max_align)
 {
   unsigned int align, inner;
@@ -9360,6 +9371,9 @@
    ellipses, otherwise the last specifier must be a VOID_TYPE.  */
 
 /* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
+static
+#endif
 int    /* export this for LLVM to use*/
 /* LLVM LOCAL end */
 validate_arglist (tree arglist, ...)

Modified: llvm-gcc-4.2/trunk/gcc/c-incpath.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-incpath.c?rev=54183&r1=54182&r2=54183&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-incpath.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-incpath.c Tue Jul 29 18:52:44 2008
@@ -176,6 +176,7 @@
     }
 }
 
+
 /* APPLE LOCAL begin headermaps 3871393 */ 
 #include <stdint.h>
 

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=54183&r1=54182&r2=54183&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/passes.c (original)
+++ llvm-gcc-4.2/trunk/gcc/passes.c Tue Jul 29 18:52:44 2008
@@ -83,9 +83,9 @@
 #include "tree-pass.h"
 #include "tree-dump.h"
 /* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
 #include "llvm.h"
 
-#ifdef ENABLE_LLVM
 /* LLVM doesn't need the GCC scheduler.  Clear this so it need not be linked
    in.  */
 #undef INSN_SCHEDULING
@@ -198,11 +198,11 @@
     {
     /* LLVM LOCAL begin */
 #ifndef ENABLE_LLVM
-    timevar_push (TV_SYMOUT);
-    debug_hooks->type_decl (decl, !top_level);
-    timevar_pop (TV_SYMOUT);
+      timevar_push (TV_SYMOUT);
+      debug_hooks->type_decl (decl, !top_level);
+      timevar_pop (TV_SYMOUT);
 #else
-    llvm_emit_typedef (decl);
+      llvm_emit_typedef (decl);
 #endif
     /* LLVM LOCAL end */
     }
@@ -246,7 +246,7 @@
   enum tree_dump_index i;
   struct dump_file_info *dfi;
   char *name;
-  
+
   timevar_push (TV_DUMP);
   if (profile_arc_flag || flag_test_coverage || flag_branch_probabilities)
     {
@@ -725,6 +725,11 @@
   NEXT_PASS (pass_sms);
   NEXT_PASS (pass_sched);
   NEXT_PASS (pass_local_alloc);
+  /* APPLE LOCAL begin 5695218 */
+#ifdef TARGET_386
+  NEXT_PASS (pass_life3);
+#endif
+  /* APPLE LOCAL end 5695218 */
   NEXT_PASS (pass_global_alloc);
   NEXT_PASS (pass_postreload);
   *p = NULL;