[llvm-commits] [llvm-gcc-4.2] r77226 - in /llvm-gcc-4.2/trunk/gcc: c-common.c c-common.h c-opts.c config/arm/arm.h optabs.c tree.c

[Bob Wilson]

Author: bwilson
Date: Mon Jul 27 13:38:17 2009
New Revision: 77226

URL: http://llvm.org/viewvc/llvm-project?rev=77226&view=rev
Log:
Adjust some ENABLE_LLVM ifdefs to allow building for gcc instead of llvm-gcc.

Modified:
    llvm-gcc-4.2/trunk/gcc/c-common.c
    llvm-gcc-4.2/trunk/gcc/c-common.h
    llvm-gcc-4.2/trunk/gcc/c-opts.c
    llvm-gcc-4.2/trunk/gcc/config/arm/arm.h
    llvm-gcc-4.2/trunk/gcc/optabs.c
    llvm-gcc-4.2/trunk/gcc/tree.c

Modified: llvm-gcc-4.2/trunk/gcc/c-common.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.c?rev=77226&r1=77225&r2=77226&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-common.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-common.c Mon Jul 27 13:38:17 2009
@@ -303,7 +303,6 @@
 
 /* APPLE LOCAL begin default to Wformat-security 5764921 */
 /* LLVM LOCAL begin initialize via config/darwin.h */
-#ifdef ENABLE_LLVM
 #ifndef WARN_FORMAT_INIT
 #define WARN_FORMAT_INIT 0
 #endif
@@ -312,9 +311,6 @@
 #endif
 int warn_format = WARN_FORMAT_INIT;
 int warn_format_security = WARN_FORMAT_SECURITY_INIT;
-#else
-int warn_format = 1;
-#endif
 /* LLVM LOCAL end initialize via config/darwin.h */
 /* APPLE LOCAL end default to Wformat-security 5764921 */
 

Modified: llvm-gcc-4.2/trunk/gcc/c-common.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.h?rev=77226&r1=77225&r2=77226&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-common.h (original)
+++ llvm-gcc-4.2/trunk/gcc/c-common.h Mon Jul 27 13:38:17 2009
@@ -467,11 +467,9 @@
 extern int warn_format;
 
 /* LLVM LOCAL begin */
-#ifdef ENABLE_LLVM
 /* Warn about possible security problems with format functions  */
 
 extern int warn_format_security;
-#endif
 /* LLVM LOCAL end */
 
 /* APPLE LOCAL begin disable_typechecking_for_spec_flag */

Modified: llvm-gcc-4.2/trunk/gcc/c-opts.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-opts.c?rev=77226&r1=77225&r2=77226&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-opts.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-opts.c Mon Jul 27 13:38:17 2009
@@ -1193,9 +1193,7 @@
       warning (OPT_Wformat_nonliteral,
 	       "-Wformat-nonliteral ignored without -Wformat");
       /* LLVM LOCAL begin */
-#ifdef ENABLE_LLVM
       if (warn_format_security)
-#endif
         warning (OPT_Wformat_security,
                  "-Wformat-security ignored without -Wformat");
       /* LLVM LOCAL end */

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.h Mon Jul 27 13:38:17 2009
@@ -3231,8 +3231,6 @@
 };
 
 /* LLVM LOCAL begin */
-#ifdef ENABLE_LLVM
-
 /* Define a static enumeration of the NEON builtins to be used when
    converting to LLVM intrinsics.  These names are derived from the
    neon_builtin_data table in arm.c and should be kept in sync with that.  */
@@ -3391,6 +3389,7 @@
   NEON_BUILTIN_MAX
 };
 
+#ifdef ENABLE_LLVM
 #define LLVM_TARGET_INTRINSIC_PREFIX "arm"
 
 /* LLVM_TARGET_NAME - This specifies the name of the target, which correlates to

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=77226&r1=77225&r2=77226&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/optabs.c (original)
+++ llvm-gcc-4.2/trunk/gcc/optabs.c Mon Jul 27 13:38:17 2009
@@ -59,11 +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.  */

Modified: llvm-gcc-4.2/trunk/gcc/tree.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree.c?rev=77226&r1=77225&r2=77226&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tree.c Mon Jul 27 13:38:17 2009
@@ -7948,7 +7948,7 @@
 /* APPLE LOCAL end CW asm blocks */
 
 /* LLVM LOCAL begin */
-#ifdef ENABLE_LLVM
+/* Do not conditionalize this on ENABLE_LLVM.  The GTY gets used regardless. */
 /* This data structure keeps gcc's garbage collector from
    deleting types created by the llvm virtual base class handling
    stuff in llvm-types.cpp. */
@@ -7959,7 +7959,6 @@
 {
   VEC_safe_push(tree, gc, llvm_types_used, type);
 }
-#endif
 /* LLVM LOCAL end */
 
 /* APPLE LOCAL begin weak_import on property 6676828 */