[llvm-commits] [llvm-gcc-4.2] r61471 - in /llvm-gcc-4.2/trunk/gcc: builtins.def global.c libfuncs.h tree.h

[Duncan Sands]

Author: baldrick
Date: Mon Dec 29 11:37:11 2008
New Revision: 61471

URL: http://llvm.org/viewvc/llvm-project?rev=61471&view=rev
Log:
Get llvm-gcc closer to compiling when llvm is
not enabled.  It now dies in i386.c due to SSE4
stuff.

Modified:
    llvm-gcc-4.2/trunk/gcc/builtins.def
    llvm-gcc-4.2/trunk/gcc/global.c
    llvm-gcc-4.2/trunk/gcc/libfuncs.h
    llvm-gcc-4.2/trunk/gcc/tree.h

Modified: llvm-gcc-4.2/trunk/gcc/builtins.def
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/builtins.def?rev=61471&r1=61470&r2=61471&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/builtins.def (original)
+++ llvm-gcc-4.2/trunk/gcc/builtins.def Mon Dec 29 11:37:11 2008
@@ -697,7 +697,11 @@
 
 /* Implementing nested functions.  */
 DEF_BUILTIN_STUB (BUILT_IN_INIT_TRAMPOLINE, "__builtin_init_trampoline")
-/* LLVM local deleted 1 line */
+/* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
+DEF_BUILTIN_STUB (BUILT_IN_ADJUST_TRAMPOLINE, "__builtin_adjust_trampoline")
+#endif
+/* LLVM LOCAL end */
 DEF_BUILTIN_STUB (BUILT_IN_NONLOCAL_GOTO, "__builtin_nonlocal_goto")
 
 /* Implementing __builtin_setjmp.  */

Modified: llvm-gcc-4.2/trunk/gcc/global.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/global.c?rev=61471&r1=61470&r2=61471&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/global.c (original)
+++ llvm-gcc-4.2/trunk/gcc/global.c Mon Dec 29 11:37:11 2008
@@ -2726,8 +2726,12 @@
       if (!REG_P (regno_reg_rtx[i]))
 	fprintf (file, "pseudo %d: ", i);
       print_inline_rtx (file, regno_reg_rtx[i], 0);
+/* LLVM LOCAL begin */
+#ifdef REWRITE_WEIGHT_COMPUTATION
       if (reg_renumber[i] > -1)
 	fprintf (file, " w=" HOST_WIDE_INT_PRINT_DEC, local_reg_weight[reg_renumber[i]]);
+#endif
+/* LLVM LOCAL end */
       fprintf (file, "\n");
     }
   /* APPLE LOCAL end 5695218 */

Modified: llvm-gcc-4.2/trunk/gcc/libfuncs.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/libfuncs.h?rev=61471&r1=61470&r2=61471&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/libfuncs.h (original)
+++ llvm-gcc-4.2/trunk/gcc/libfuncs.h Mon Dec 29 11:37:11 2008
@@ -55,11 +55,11 @@
    implicitly and not via optabs.  */
 extern GTY(()) rtx libfunc_table[LTI_MAX];
 /* LLVM LOCAL begin */
-#ifdef ENABLE_LLVM
 /* FUNCTION_DECL nodes for the library functions that are called
-   implicitly and not via optabs.  */
+   implicitly and not via optabs.  This needs to be declared even
+   when not building for LLVM because the garbage collector logic
+   ignores preprocessor directives.  */
 extern GTY(()) tree llvm_libfunc_table[LTI_MAX];
-#endif
 /* LLVM LOCAL end */
 
 /* Accessor macros for libfunc_table.  */

Modified: llvm-gcc-4.2/trunk/gcc/tree.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree.h?rev=61471&r1=61470&r2=61471&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree.h (original)
+++ llvm-gcc-4.2/trunk/gcc/tree.h Mon Dec 29 11:37:11 2008
@@ -4513,7 +4513,9 @@
 
 /* In builtins.c */
 /* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
 extern int validate_arglist (tree, ...);
+#endif
 /* LLVM LOCAL end */
 extern tree fold_builtin (tree, tree, bool);
 extern tree fold_builtin_fputs (tree, bool, bool, tree);