[llvm-commits] [llvm-gcc-4.2] r54290 - in /llvm-gcc-4.2/trunk/gcc: bt-load.c builtins.c

[Bill Wendling]

Author: void
Date: Sat Aug  2 23:13:16 2008
New Revision: 54290

URL: http://llvm.org/viewvc/llvm-project?rev=54290&view=rev
Log:
Restore behavior when ENABLE_LLVM isn't #defined.

Modified:
    llvm-gcc-4.2/trunk/gcc/bt-load.c
    llvm-gcc-4.2/trunk/gcc/builtins.c

Modified: llvm-gcc-4.2/trunk/gcc/bt-load.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/bt-load.c?rev=54290&r1=54289&r2=54290&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/bt-load.c (original)
+++ llvm-gcc-4.2/trunk/gcc/bt-load.c Sat Aug  2 23:13:16 2008
@@ -1510,6 +1510,7 @@
 /* LLVM LOCAL begin - reduce cc1 size.  */
 #ifndef ENABLE_LLVM
   static int warned = 0;
+
   /* Leave this a warning for now so that it is possible to experiment
      with running this pass twice.  In 3.6, we should either make this
      an error, or use separate dump files.  */

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=54290&r1=54289&r2=54290&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/builtins.c (original)
+++ llvm-gcc-4.2/trunk/gcc/builtins.c Sat Aug  2 23:13:16 2008
@@ -5314,14 +5314,39 @@
   trampolines_created = 1;
   INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
 
-/* LLVM local begin */
+/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
 #ifdef TRAMPOLINE_ADJUST_ADDRESS
   TRAMPOLINE_ADJUST_ADDRESS (r_tramp);
 #endif
 
   return r_tramp;
+#else
+  return const0_rtx;
+#endif
+/* LLVM LOCAL end */
 }
-/* LLVM local end */
+
+/* LLVM LOCAL */
+#ifndef ENABLE_LLVM
+static rtx
+expand_builtin_adjust_trampoline (tree arglist)
+{
+  rtx tramp;
+
+  if (!validate_arglist (arglist, POINTER_TYPE, VOID_TYPE))
+    return NULL_RTX;
+
+  tramp = expand_normal (TREE_VALUE (arglist));
+  tramp = round_trampoline_addr (tramp);
+#ifdef TRAMPOLINE_ADJUST_ADDRESS
+  TRAMPOLINE_ADJUST_ADDRESS (tramp);
+#endif
+
+  return tramp;
+}
+/* LLVM LOCAL */
+#endif
 
 /* Expand a call to the built-in signbit, signbitf or signbitl function.
    Return NULL_RTX if a normal call should be emitted rather than expanding
@@ -6307,7 +6332,7 @@
 
     case BUILT_IN_INIT_TRAMPOLINE:
       return expand_builtin_init_trampoline (arglist);
-    /* LLVM local deleted 2 lines */
+    /* LLVM LOCAL deleted 2 lines */
 
     case BUILT_IN_FORK:
     case BUILT_IN_EXECL: