[llvm-commits] [llvm-gcc-4.2] r62892 - in /llvm-gcc-4.2/trunk/gcc: config/i386/i386.h config/i386/llvm-i386-target.h config/i386/llvm-i386.cpp expr.h optabs.c

[Dale Johannesen]

Author: johannes
Date: Fri Jan 23 16:53:04 2009
New Revision: 62892

URL: http://llvm.org/viewvc/llvm-project?rev=62892&view=rev
Log:
Reenable building without -enable-llvm.  This works
for x86-32; I make no claims about how well the
result works.


Modified:
    llvm-gcc-4.2/trunk/gcc/config/i386/i386.h
    llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386-target.h
    llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp
    llvm-gcc-4.2/trunk/gcc/expr.h
    llvm-gcc-4.2/trunk/gcc/optabs.c

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/i386.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/i386.h?rev=62892&r1=62891&r2=62892&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/i386.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/i386.h Fri Jan 23 16:53:04 2009
@@ -305,8 +305,8 @@
    redefines this to 1.  */
 #define TARGET_MACHO 0
 /* LLVM LOCAL begin mainline */
-#ifdef ENABLE_LLVM
 /* Likewise, for the Windows 64-bit ABI.  */
+#ifndef TARGET_64BIT_MS_ABI
 #define TARGET_64BIT_MS_ABI 0
 #endif
 /* LLVM LOCAL end mainline */
@@ -3279,7 +3279,6 @@
 	((SYMBOL_REF_FLAGS (X) & SYMBOL_FLAG_FAR_ADDR) != 0)
 
 /* LLVM LOCAL begin */
-#ifdef ENABLE_LLVM
 /* Codes for all the SSE/MMX builtins.  */
 enum ix86_builtins
 {
@@ -3863,6 +3862,7 @@
   IX86_BUILTIN_MAX
 };
 
+#ifdef ENABLE_LLVM
 /* LLVM_TARGET_INTRINSIC_PREFIX - Specify what prefix this target uses for its
  * intrinsics.
  */

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386-target.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386-target.h?rev=62892&r1=62891&r2=62892&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386-target.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386-target.h Fri Jan 23 16:53:04 2009
@@ -1,4 +1,5 @@
 /* LLVM LOCAL begin (ENTIRE FILE!)  */
+#ifdef ENABLE_LLVM
 /* Some target-specific hooks for gcc->llvm conversion
 Copyright (C) 2007 Free Software Foundation, Inc.
 Contributed by Anton Korobeynikov (asl at math.spbu.ru)
@@ -237,6 +238,6 @@
   llvm_x86_load_scalar_argument((LOC),(TY),(SIZE),(BUILDER))
 
 #endif /* LLVM_ABI_H */
-
+#endif /* ENABLE_LLVM */
 /* LLVM LOCAL end (ENTIRE FILE!)  */
 

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp?rev=62892&r1=62891&r2=62892&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp Fri Jan 23 16:53:04 2009
@@ -1,4 +1,5 @@
 /* LLVM LOCAL begin (ENTIRE FILE!)  */
+#ifdef ENABLE_LLVM
 /* High-level LLVM backend interface 
 Copyright (C) 2005 Free Software Foundation, Inc.
 Contributed by Evan Cheng (evan.cheng at apple.com)
@@ -1477,5 +1478,5 @@
   else 
     return !isSingleElementStructOrArray(type, false, true);
 }
-
+#endif /* ENABLE_LLVM */
 /* LLVM LOCAL end (ENTIRE FILE!)  */

Modified: llvm-gcc-4.2/trunk/gcc/expr.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/expr.h?rev=62892&r1=62891&r2=62892&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/expr.h (original)
+++ llvm-gcc-4.2/trunk/gcc/expr.h Fri Jan 23 16:53:04 2009
@@ -755,8 +755,8 @@
 extern rtx init_one_libfunc (const char *);
 /* LLVM LOCAL begin */
 /* Call this to initialize an optab function tree.  */
-#ifdef ENABLE_LLVM
 extern tree llvm_init_one_libfunc_impl (const char *);
+#ifdef ENABLE_LLVM
 #define llvm_init_one_libfunc	llvm_init_one_libfunc_impl
 #else
 #define llvm_init_one_libfunc	init_one_libfunc

Modified: llvm-gcc-4.2/trunk/gcc/optabs.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/optabs.c?rev=62892&r1=62891&r2=62892&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/optabs.c (original)
+++ llvm-gcc-4.2/trunk/gcc/optabs.c Fri Jan 23 16:53:04 2009
@@ -59,9 +59,9 @@
 
 rtx libfunc_table[LTI_MAX];
 /* LLVM LOCAL begin */
-#ifdef ENABLE_LLVM
+/* This needs to be defined even when not building for LLVM because
+   the garbage collector logic ignores preprocessor directives. */
 tree llvm_libfunc_table[LTI_MAX];
-#endif
 /* LLVM LOCAL end */
 
 /* Tables of patterns for converting one mode to another.  */