[llvm-commits] [llvm-gcc-4.2] r64576 - in /llvm-gcc-4.2/trunk: build_gcc gcc/builtin-types.def gcc/builtins.c gcc/builtins.def gcc/c-common.c gcc/c-incpath.c gcc/c-lex.c gcc/c-opts.c gcc/c-parser.c gcc/cgraph.c gcc/cgraphunit.c gcc/config/arm/arm.c gcc/config/i386/i386.c gcc/cp/parser.c gcc/gcc.c gcc/ipa.c gcc/objc/objc-act.c gcc/optabs.c gcc/opts.c gcc/stub-objc.c gcc/target-def.h gcc/toplev.c gcc/toplev.h gcc/tree-nested.c gcc/tree-ssa-ccp.c gcc/tree.c gcc/tree.h gcc/varasm.c
Bill Wendling
isanbard at gmail.com
Sat Feb 14 20:17:58 PST 2009
Author: void
Date: Sat Feb 14 22:17:54 2009
New Revision: 64576
URL: http://llvm.org/viewvc/llvm-project?rev=64576&view=rev
Log:
Fix LLVM LOCAL labels. Add #ifdef ENABLE_LLVM where applicable.
Modified:
llvm-gcc-4.2/trunk/build_gcc
llvm-gcc-4.2/trunk/gcc/builtin-types.def
llvm-gcc-4.2/trunk/gcc/builtins.c
llvm-gcc-4.2/trunk/gcc/builtins.def
llvm-gcc-4.2/trunk/gcc/c-common.c
llvm-gcc-4.2/trunk/gcc/c-incpath.c
llvm-gcc-4.2/trunk/gcc/c-lex.c
llvm-gcc-4.2/trunk/gcc/c-opts.c
llvm-gcc-4.2/trunk/gcc/c-parser.c
llvm-gcc-4.2/trunk/gcc/cgraph.c
llvm-gcc-4.2/trunk/gcc/cgraphunit.c
llvm-gcc-4.2/trunk/gcc/config/arm/arm.c
llvm-gcc-4.2/trunk/gcc/config/i386/i386.c
llvm-gcc-4.2/trunk/gcc/cp/parser.c
llvm-gcc-4.2/trunk/gcc/gcc.c
llvm-gcc-4.2/trunk/gcc/ipa.c
llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
llvm-gcc-4.2/trunk/gcc/optabs.c
llvm-gcc-4.2/trunk/gcc/opts.c
llvm-gcc-4.2/trunk/gcc/stub-objc.c
llvm-gcc-4.2/trunk/gcc/target-def.h
llvm-gcc-4.2/trunk/gcc/toplev.c
llvm-gcc-4.2/trunk/gcc/toplev.h
llvm-gcc-4.2/trunk/gcc/tree-nested.c
llvm-gcc-4.2/trunk/gcc/tree-ssa-ccp.c
llvm-gcc-4.2/trunk/gcc/tree.c
llvm-gcc-4.2/trunk/gcc/tree.h
llvm-gcc-4.2/trunk/gcc/varasm.c
Modified: llvm-gcc-4.2/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Sat Feb 14 22:17:54 2009
@@ -407,10 +407,10 @@
$DIR/dst-*-$TARG0$DEST_ROOT/bin/*gcov* || exit 1
# The fully-named drivers, which have the same target on every host.
for t in $TARGETS ; do
-# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
+# LLVM LOCAL build_gcc bug with non-/usr $DEST_ROOT
lipo -output .$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-llvm-gcc-$MAJ_VERS -create \
$DIR/dst-*-$t/$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-gcc-$VERS || exit 1
-# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
+# LLVM LOCAL build_gcc bug with non-/usr $DEST_ROOT
lipo -output .$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-llvm-g++-$MAJ_VERS -create \
$DIR/dst-*-$t/$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-*g++* || exit 1
done
Modified: llvm-gcc-4.2/trunk/gcc/builtin-types.def
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/builtin-types.def?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/builtin-types.def (original)
+++ llvm-gcc-4.2/trunk/gcc/builtin-types.def Sat Feb 14 22:17:54 2009
@@ -303,10 +303,10 @@
DEF_FUNCTION_TYPE_2 (BT_FN_I16_VPTR_I16, BT_I16, BT_VOLATILE_PTR, BT_I16)
DEF_FUNCTION_TYPE_2 (BT_FN_BOOL_LONGPTR_LONGPTR,
BT_BOOL, BT_PTR_LONG, BT_PTR_LONG)
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
DEF_FUNCTION_TYPE_2 (BT_FN_UINT_UINT_CONST_STRING,
BT_UINT, BT_UINT, BT_CONST_STRING)
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
DEF_FUNCTION_TYPE_3 (BT_FN_STRING_STRING_CONST_STRING_SIZE,
BT_STRING, BT_STRING, BT_CONST_STRING, BT_SIZE)
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=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/builtins.c (original)
+++ llvm-gcc-4.2/trunk/gcc/builtins.c Sat Feb 14 22:17:54 2009
@@ -6332,12 +6332,12 @@
case BUILT_IN_INIT_TRAMPOLINE:
return expand_builtin_init_trampoline (arglist);
- /* LLVM LOCAL begin deleted 2 lines */
+ /* LLVM LOCAL begin disable builtin adjust trampoline */
#ifndef ENABLE_LLVM
case BUILT_IN_ADJUST_TRAMPOLINE:
return expand_builtin_adjust_trampoline (arglist);
#endif
- /* LLVM LOCAL end deleted 2 lines */
+ /* LLVM LOCAL end disable builtin adjust trampoline */
case BUILT_IN_FORK:
case BUILT_IN_EXECL:
@@ -9401,12 +9401,12 @@
of tree_codes. If the last specifier is a 0, that represents an
ellipses, otherwise the last specifier must be a VOID_TYPE. */
-/* LLVM LOCAL begin */
+/* LLVM LOCAL begin export for LLVM to use */
#ifndef ENABLE_LLVM
static
#endif
-int /* export this for LLVM to use*/
-/* LLVM LOCAL end */
+int
+/* LLVM LOCAL end export for LLVM to use */
validate_arglist (tree arglist, ...)
{
enum tree_code code;
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=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/builtins.def (original)
+++ llvm-gcc-4.2/trunk/gcc/builtins.def Sat Feb 14 22:17:54 2009
@@ -692,7 +692,9 @@
DEF_C99_BUILTIN (BUILT_IN__EXIT2, "_Exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
DEF_GCC_BUILTIN (BUILT_IN_ANNOTATION, "annotation", BT_FN_UINT_UINT_CONST_STRING, ATTR_NULL)
+#endif
/* LLVM LOCAL end */
/* Implementing nested functions. */
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=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-common.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-common.c Sat Feb 14 22:17:54 2009
@@ -299,6 +299,7 @@
/* 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
@@ -307,6 +308,9 @@
#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-incpath.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-incpath.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-incpath.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-incpath.c Sat Feb 14 22:17:54 2009
@@ -32,8 +32,11 @@
#include "cppdefault.h"
/* APPLE LOCAL headermaps 3871393 */
#include "errors.h"
-/* LLVM LOCAL sysroot */
+/* LLVM LOCAL begin - sysroot */
+#ifdef ENABLE_LLVM
#include "target-def.h"
+#endif
+/* LLVM LOCAL end - sysroot */
/* Windows does not natively support inodes, and neither does MSDOS.
Cygwin's emulation can generate non-unique inodes, so don't use it.
@@ -127,11 +130,13 @@
}
/* LLVM LOCAL begin sysroot */
+#ifdef ENABLE_LLVM
char *default_build_sysroot_path(const char *sysroot, const char *path);
char *
default_build_sysroot_path(const char *sysroot, const char *path) {
return concat (sysroot, path, NULL);
}
+#endif
/* LLVM LOCAL end sysroot */
/* Append the standard include chain defined in cppdefault.c. */
@@ -175,8 +180,13 @@
/* Should this directory start with the sysroot? */
if (sysroot && p->add_sysroot)
- /* LLVM LOCAL sysroot */
+ /* LLVM LOCAL begin sysroot */
+#ifdef ENABLE_LLVM
str = TARGET_BUILD_SYSROOT_PATH(sysroot, p->fname);
+#else
+ str = concat (sysroot, p->fname, NULL);
+#endif
+ /* LLVM LOCAL end sysroot */
else
str = update_path (p->fname, p->component);
@@ -247,9 +257,9 @@
/* If it is a regular file and if it is large enough to be a header-
map, see if it really is one. */
if (fstat (fileno (f), &f_info) == 0 && S_ISREG(f_info.st_mode)
- /* LLVM LOCAL begin */
- && (unsigned) f_info.st_size >= sizeof(struct hmap_header_map))
- /* LLVM LOCAL end */
+ /* LLVM LOCAL begin */
+ && (unsigned) f_info.st_size >= sizeof(struct hmap_header_map))
+ /* LLVM LOCAL end */
{
unsigned headermap_size = f_info.st_size;
Modified: llvm-gcc-4.2/trunk/gcc/c-lex.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-lex.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-lex.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-lex.c Sat Feb 14 22:17:54 2009
@@ -777,6 +777,7 @@
}
/* LLVM LOCAL begin hack for PR1521 */
+#ifdef ENABLE_LLVM
#define PART_PRECISION (sizeof (cpp_num_part) * CHAR_BIT)
/* Sign extend a number, with PRECISION significant bits and all
others assumed clear, to fill out a cpp_num structure. */
@@ -802,6 +803,7 @@
return num;
}
+#endif
/* LLVM LOCAL end */
/* Interpret TOKEN, an integer with FLAGS as classified by cpplib. */
@@ -814,8 +816,13 @@
cpp_options *options = cpp_get_options (parse_in);
integer = cpp_interpret_integer (parse_in, token, flags);
- /* LLVM LOCAL hack for PR1521 */
+ /* LLVM LOCAL begin - hack for PR1521 */
+#ifdef ENABLE_LLVM
integer = my_cpp_num_sign_extend (integer, options->precision);
+#else
+ integer = cpp_num_sign_extend (integer, options->precision);
+#endif
+ /* LLVM LOCAL end - hack for PR1521 */
/* The type of a constant with a U suffix is straightforward. */
if (flags & CPP_N_UNSIGNED)
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=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-opts.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-opts.c Sat Feb 14 22:17:54 2009
@@ -1188,7 +1188,9 @@
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/c-parser.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-parser.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-parser.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-parser.c Sat Feb 14 22:17:54 2009
@@ -10201,8 +10201,11 @@
block_helper_function_decl = build_helper_func_decl (build_block_helper_name (0),
ftype);
DECL_CONTEXT (block_helper_function_decl) = current_function_decl;
- /* LLVM LOCAL 6530487 - blocks helper functions never need a static chain */
+ /* LLVM LOCAL begin 6530487 - blocks helper functions never need a static chain */
+#ifdef ENABLE_LLVM
DECL_NO_STATIC_CHAIN (block_helper_function_decl) = 1;
+#endif
+ /* LLVM LOCAL end 6530487 - blocks helper functions never need a static chain */
cur_block->helper_func_decl = block_helper_function_decl;
push_function_context ();
Modified: llvm-gcc-4.2/trunk/gcc/cgraph.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cgraph.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cgraph.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cgraph.c Sat Feb 14 22:17:54 2009
@@ -600,8 +600,13 @@
struct cgraph_node *n = (struct cgraph_node *) *slot;
if (!n->next_clone && !n->global.inlined_to
&& (cgraph_global_info_ready
- /* LLVM LOCAL extern inline */
+ /* LLVM LOCAL begin - extern inline */
+#ifdef ENABLE_LLVM
&& (TREE_ASM_WRITTEN (n->decl) || IS_EXTERN_INLINE (n->decl))))
+#else
+ && (TREE_ASM_WRITTEN (n->decl) || DECL_EXTERNAL (n->decl))))
+#endif
+ /* LLVM LOCAL end - extern inline */
kill_body = true;
}
@@ -1184,8 +1189,13 @@
good optimization is what this optimization is about. */
else if (!(*targetm.binds_local_p) (node->decl)
- /* LLVM LOCAL extern inline */
+ /* LLVM LOCAL begin - extern inline */
+#ifdef ENABLE_LLVM
&& !DECL_COMDAT (node->decl) && !IS_EXTERN_INLINE (node->decl))
+#else
+ && !DECL_COMDAT (node->decl) && !DECL_EXTERNAL (node->decl))
+#endif
+ /* LLVM LOCAL end - extern inline */
avail = AVAIL_OVERWRITABLE;
else avail = AVAIL_AVAILABLE;
Modified: llvm-gcc-4.2/trunk/gcc/cgraphunit.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cgraphunit.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cgraphunit.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cgraphunit.c Sat Feb 14 22:17:54 2009
@@ -384,8 +384,13 @@
n->next_needed = NULL;
if (!n->global.inlined_to
&& !n->alias
- /* LLVM LOCAL extern inline */
+ /* LLVM LOCAL begin - extern inline */
+#ifdef ENABLE_LLVM
&& !IS_EXTERN_INLINE (n->decl))
+#else
+ && !DECL_EXTERNAL (n->decl))
+#endif
+ /* LLVM LOCAL end - extern inline */
{
cgraph_expand_function (n);
output = true;
@@ -848,8 +853,13 @@
if (node->analyzed
&& DECL_SAVED_TREE (node->decl) && !TREE_ASM_WRITTEN (node->decl)
- /* LLVM LOCAL extern inline */
- && (!IS_EXTERN_INLINE (node->decl) || node->global.inlined_to))
+ /* LLVM LOCAL begin - extern inline */
+#ifdef ENABLE_LLVM
+ && (!IS_EXTERN_INLINE (node->decl) || node->global.inlined_to))
+#else
+ && (!DECL_EXTERNAL (node->decl) || node->global.inlined_to))
+#endif
+ /* LLVM LOCAL end - extern inline */
{
if (this_cfun->cfg)
{
@@ -1294,24 +1304,39 @@
&& (node->needed
|| (e && node->reachable))
&& !TREE_ASM_WRITTEN (decl)
- /* LLVM LOCAL extern inline */
+ /* LLVM LOCAL begin - extern inline */
+#ifdef ENABLE_LLVM
&& !IS_EXTERN_INLINE (decl))
+#else
+ && !DECL_EXTERNAL (decl))
+#endif
+ /* LLVM LOCAL end - extern inline */
node->output = 1;
else
{
/* We should've reclaimed all functions that are not needed. */
#ifdef ENABLE_CHECKING
if (!node->global.inlined_to && DECL_SAVED_TREE (decl)
- /* LLVM LOCAL extern inline */
+ /* LLVM LOCAL begin - extern inline */
+#ifdef ENABLE_LLVM
&& !IS_EXTERN_INLINE (decl))
+#else
+ && !DECL_EXTERNAL (decl))
+#endif
+ /* LLVM LOCAL end - extern inline */
{
dump_cgraph_node (stderr, node);
internal_error ("failed to reclaim unneeded function");
}
#endif
gcc_assert (node->global.inlined_to || !DECL_SAVED_TREE (decl)
- /* LLVM LOCAL extern inline */
+ /* LLVM LOCAL begin - extern inline */
+#ifdef ENABLE_LLVM
|| IS_EXTERN_INLINE (decl));
+#else
+ || DECL_EXTERNAL (decl));
+#endif
+ /* LLVM LOCAL end - extern inline */
}
Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/arm.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/arm.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.c Sat Feb 14 22:17:54 2009
@@ -84,11 +84,11 @@
static const char *fp_const_from_val (REAL_VALUE_TYPE *);
static arm_cc get_arm_condition_code (rtx);
static HOST_WIDE_INT int_log2 (HOST_WIDE_INT);
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
static rtx is_jump_table (rtx);
-/* LLVM LOCAL */
#endif
+/* LLVM LOCAL end */
static const char *output_multi_immediate (rtx *, const char *, const char *,
int, HOST_WIDE_INT);
static const char *shift_op (rtx, HOST_WIDE_INT *);
@@ -99,7 +99,7 @@
static int handle_thumb_exit (FILE *, int, bool);
static int handle_thumb_pushpop (FILE *, unsigned long, int, int *, unsigned long, bool);
/* APPLE LOCAL end compact switch tables */
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
static HOST_WIDE_INT get_jump_table_size (rtx);
static Mnode *move_minipool_fix_forward_ref (Mnode *, Mnode *, HOST_WIDE_INT);
@@ -114,14 +114,14 @@
static void push_minipool_barrier (rtx, HOST_WIDE_INT);
static void push_minipool_fix (rtx, HOST_WIDE_INT, rtx *, enum machine_mode,
rtx);
-/* LLVM LOCAL */
#endif
+/* LLVM LOCAL end */
static void arm_reorg (void);
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
static bool note_invalid_constants (rtx, HOST_WIDE_INT, int);
-/* LLVM LOCAL */
#endif
+/* LLVM LOCAL end */
static int current_file_function_operand (rtx);
static unsigned long arm_compute_save_reg0_reg12_mask (void);
static unsigned long arm_compute_save_reg_mask (void);
@@ -151,13 +151,13 @@
static bool arm_xscale_rtx_costs (rtx, int, int, int *);
static bool arm_9e_rtx_costs (rtx, int, int, int *);
static int arm_address_cost (rtx);
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
static bool arm_memory_load_p (rtx);
static bool arm_cirrus_insn_p (rtx);
static void cirrus_reorg (rtx);
-/* LLVM LOCAL */
#endif
+/* LLVM LOCAL end */
static void arm_init_builtins (void);
static rtx arm_expand_builtin (tree, rtx, rtx, enum machine_mode, int);
static void arm_init_iwmmxt_builtins (void);
@@ -447,11 +447,11 @@
#endif
/* APPLE LOCAL end ARM darwin local binding */
/* APPLE LOCAL ARM 6008578 */
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
static HOST_WIDE_INT get_label_pad (rtx, HOST_WIDE_INT);
-/* LLVM LOCAL */
#endif
+/* LLVM LOCAL end */
/* APPLE LOCAL begin ARM reliable backtraces */
#undef TARGET_BUILTIN_SETJMP_FRAME_VALUE
@@ -5912,7 +5912,7 @@
static int
arm_adjust_cost (rtx insn, rtx link, rtx dep, int cost)
{
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
insn = insn;
link = link;
@@ -5920,6 +5920,7 @@
cost = cost;
return 1;
#else
+/* LLVM LOCAL end */
rtx i_pat, d_pat;
/* Some true dependencies can have a higher cost depending
@@ -12977,10 +12978,11 @@
void
arm_final_prescan_insn (rtx insn)
{
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
insn = insn;
#else
+/* LLVM LOCAL end */
/* BODY will hold the body of INSN. */
rtx body = PATTERN (insn);
@@ -14838,10 +14840,11 @@
static int
thumb_far_jump_used_p (void)
{
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
return 0;
#else
+/* LLVM LOCAL end */
rtx insn;
/* This test is only important for leaf functions. */
Modified: llvm-gcc-4.2/trunk/gcc/config/i386/i386.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/i386.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/i386.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/i386.c Sat Feb 14 22:17:54 2009
@@ -1778,6 +1778,7 @@
else
{
/* LLVM LOCAL begin mainline */
+#ifdef ENABLE_LLVM
/* For TARGET_64BIT_MS_ABI, force pic on, in order to enable the
use of rip-relative addressing. This eliminates fixups that
would otherwise be needed if this object is to be placed in a
@@ -1788,6 +1789,11 @@
ix86_cmodel = flag_pic ? CM_SMALL_PIC : CM_SMALL;
else
ix86_cmodel = CM_32;
+#else
+ ix86_cmodel = CM_32;
+ if (TARGET_64BIT)
+ ix86_cmodel = flag_pic ? CM_SMALL_PIC : CM_SMALL;
+#endif
/* LLVM LOCAL end mainline */
}
if (ix86_asm_string != 0)
@@ -1905,8 +1911,10 @@
if (ix86_regparm_string)
{
/* LLVM LOCAL begin mainline */
+#ifdef ENABLE_LLVM
if (TARGET_64BIT)
warning (0, "-mregparm is ignored in 64-bit mode");
+#endif
/* LLVM LOCAL end mainline */
i = atoi (ix86_regparm_string);
if (i < 0 || i > REGPARM_MAX)
@@ -1915,9 +1923,12 @@
ix86_regparm = i;
}
/* LLVM LOCAL begin mainline */
- if (TARGET_64BIT)
- ix86_regparm = REGPARM_MAX;
+#ifndef ENABLE_LLVM
+ else
+#endif
/* LLVM LOCAL end mainline */
+ if (TARGET_64BIT)
+ ix86_regparm = REGPARM_MAX;
/* If the user has provided any of the -malign-* options,
warn and use that value only if -falign-* is not set.
@@ -2021,7 +2032,9 @@
/* APPLE LOCAL end radar 4877693 */
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
target_flags |= TARGET_SUBTARGET64_DEFAULT & ~target_flags_explicit;
+#endif
/* LLVM LOCAL end */
/* Enable by default the SSE and MMX builtins. Do allow the user to
@@ -2029,9 +2042,15 @@
MMX for kernel code is extremely useful. */
if (!ix86_arch_specified)
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
target_flags
|= ((MASK_SSE2 | MASK_SSE | MASK_MMX | MASK_128BIT_LONG_DOUBLE)
& ~target_flags_explicit);
+#else
+ target_flags
+ |= ((MASK_SSE2 | MASK_SSE | MASK_MMX | MASK_128BIT_LONG_DOUBLE
+ | TARGET_SUBTARGET64_DEFAULT) & ~target_flags_explicit);
+#endif
/* LLVM LOCAL end */
/* APPLE LOCAL begin mainline candidate */
/* Disable the red zone for kernel compilation.
@@ -2445,9 +2464,12 @@
behavior most people want anyway. Numericists and others who play with or
depend on errno and can use -fmath-errno when they want it. Because errno
is not set on all targets anyway, their code is inherently non-portable. */
- if (TARGET_MACHO || 1)
+ if (TARGET_MACHO
+#ifdef ENABLE_LLVM
+ || 1
+#endif
+ )
/* LLVM LOCAL end */
-
/* The Darwin libraries never set errno, so we might as well
avoid calling them when that's the only reason we would. */
flag_errno_math = 0;
@@ -2728,8 +2750,10 @@
if (TARGET_64BIT)
{
/* LLVM LOCAL begin mainline */
+#ifdef ENABLE_LLVM
/* Do not warn when emulating the MS ABI. */
if (!TARGET_64BIT_MS_ABI)
+#endif
warning (OPT_Wattributes, "%qs attribute ignored",
IDENTIFIER_POINTER (name));
/* LLVM LOCAL end mainline */
@@ -4090,12 +4114,13 @@
the argument itself. The pointer is passed in whatever way is
appropriate for passing a pointer to that type. */
-/* LLVM LOCAL begin mainline */
static bool
ix86_pass_by_reference (CUMULATIVE_ARGS *cum ATTRIBUTE_UNUSED,
enum machine_mode mode ATTRIBUTE_UNUSED,
tree type, bool named ATTRIBUTE_UNUSED)
{
+ /* LLVM LOCAL begin mainline */
+#ifdef ENABLE_LLVM
/* See Windows x64 Software Convention. */
if (TARGET_64BIT_MS_ABI)
{
@@ -4126,8 +4151,21 @@
return 1;
return 0;
+#else
+ if (!TARGET_64BIT)
+ return 0;
+
+ if (type && int_size_in_bytes (type) == -1)
+ {
+ if (TARGET_DEBUG_ARG)
+ fprintf (stderr, "function_arg_pass_by_reference\n");
+ return 1;
+ }
+
+ return 0;
+#endif
+ /* LLVM LOCAL end mainline */
}
-/* LLVM LOCAL end mainline */
/* Return true when TYPE should be 128bit aligned for 32bit argument passing
ABI. Only called if TARGET_SSE. */
@@ -10304,11 +10342,13 @@
real_from_integer (&rvt_int_two31, SFmode, 0x80000000ULL, 0ULL, 1);
int_two31_as_fp = const_double_from_real_value (rvt_int_two31, SFmode);
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
/* This warns if HOST_WIDE_INT < 64. */
real_from_integer (&rvt_int_two32, SFmode, (HOST_WIDE_INT)0x100000000ULL,
0ULL, 1);
#endif
+ /* LLVM LOCAL end */
int_two32_as_fp = const_double_from_real_value (rvt_int_two32, SFmode);
incoming_value = force_reg (GET_MODE (operands[1]), operands[1]);
@@ -10474,11 +10514,13 @@
gen_rtx_SUBREG (V2DFmode, int_xmm, 0));
/* Integral versions of the DFmode 'exponents' above. */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
/* These get warnings if HOST_WIDE_INT < 64 */
REAL_VALUE_FROM_INT (bias_lo_rvt, 0x00000000000000ULL, 0x100000ULL, DFmode);
REAL_VALUE_FROM_INT (bias_hi_rvt, 0x10000000000000ULL, 0x000000ULL, DFmode);
#endif
+ /* LLVM LOCAL end */
bias_lo_rtx = CONST_DOUBLE_FROM_REAL_VALUE (bias_lo_rvt, DFmode);
bias_hi_rtx = CONST_DOUBLE_FROM_REAL_VALUE (bias_hi_rvt, DFmode);
biases_rtvec = gen_rtvec (2, bias_lo_rtx, bias_hi_rtx);
@@ -10575,10 +10617,12 @@
rtx int_two32_as_fp, int_two32_as_fp_vec;
rtx target = operands[0];
rtx input = force_reg (DImode, operands[1]);
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
gcc_assert(0 && "rtx floating point conversion?");
return 0;
#endif
+ /* LLVM LOCAL end */
gcc_assert (ix86_preferred_stack_boundary >= 128);
gcc_assert (GET_MODE (input) == DImode);
@@ -10589,10 +10633,12 @@
emit_insn (gen_sse2_cvtsi2sd (fp_value_hi_xmm, fp_value_hi_xmm,
gen_rtx_SUBREG (SImode, input, 4)));
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
/* This gets warnings when HOST_WIDE_INT < 64 */
real_from_integer (&rvt_int_two32, DFmode, 0x100000000ULL, 0ULL, 1);
#endif
+ /* LLVM LOCAL end */
int_two32_as_fp = const_double_from_real_value (rvt_int_two32, DFmode);
rvt_int_two32_vec = gen_rtx_CONST_VECTOR (V2DFmode,
gen_2_4_rtvec (2, int_two32_as_fp, DFmode));
Modified: llvm-gcc-4.2/trunk/gcc/cp/parser.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/parser.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/parser.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/parser.c Sat Feb 14 22:17:54 2009
@@ -21461,8 +21461,11 @@
block_helper_function_decl = build_helper_func_decl (build_block_helper_name (unique_count),
ftype);
DECL_CONTEXT (block_helper_function_decl) = current_function_decl;
- /* LLVM LOCAL 6530487 - blocks helper functions never need a static chain */
+ /* LLVM LOCAL begin 6530487 - blocks helper functions never need a static chain */
+#ifdef ENABLE_LLVM
DECL_NO_STATIC_CHAIN (block_helper_function_decl) = 1;
+#endif
+ /* LLVM LOCAL end 6530487 - blocks helper functions never need a static chain */
cur_block->helper_func_decl = block_helper_function_decl;
DECL_ARGUMENTS (block_helper_function_decl) = arglist;
Modified: llvm-gcc-4.2/trunk/gcc/gcc.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/gcc.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/gcc.c (original)
+++ llvm-gcc-4.2/trunk/gcc/gcc.c Sat Feb 14 22:17:54 2009
@@ -770,7 +770,9 @@
static const char *switches_need_spaces = SWITCHES_NEED_SPACES;
static const char *linker_name_spec = LINKER_NAME;
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
static const char *gold_plugin_file_spec = "";
+#endif
/* LLVM LOCAL end */
static const char *link_command_spec = LINK_COMMAND_SPEC;
static const char *link_libgcc_spec = LINK_LIBGCC_SPEC;
@@ -1153,7 +1155,9 @@
{"--dump", "-d", "a"},
{"--dumpbase", "-dumpbase", "a"},
/* LLVM LOCAL */
+#ifdef ENABLE_LLVM
{"--emit-llvm", "-emit-llvm", 0 },
+#endif
{"--encoding", "-fencoding=", "aj"},
{"--entry", "-e", 0},
{"--extra-warnings", "-W", 0},
@@ -1174,7 +1178,9 @@
{"--language", "-x", "a"},
{"--library-directory", "-L", "a"},
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
{"--llvm-options", "-mllvm", "a"},
+#endif
/* LLVM LOCAL end */
{"--machine", "-m", "aj"},
{"--machine-", "-m", "*j"},
@@ -1647,8 +1653,10 @@
INIT_STATIC_SPEC ("linker", &linker_name_spec),
INIT_STATIC_SPEC ("link_libgcc", &link_libgcc_spec),
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
INIT_STATIC_SPEC ("gold_plugin_file", &gold_plugin_file_spec),
INIT_STATIC_SPEC ("llvm_options", &llvm_options),
+#endif
/* LLVM LOCAL end */
INIT_STATIC_SPEC ("md_exec_prefix", &md_exec_prefix),
INIT_STATIC_SPEC ("md_startfile_prefix", &md_startfile_prefix),
@@ -7151,7 +7159,9 @@
{
int tmp = execution_count;
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
const char *use_gold_plugin = "use-gold-plugin";
+#endif
/* LLVM LOCAL end */
/* We'll use ld if we can't find collect2. */
@@ -7161,8 +7171,8 @@
if (s == NULL)
linker_name_spec = "ld";
}
-
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
if (switch_matches (use_gold_plugin,
use_gold_plugin + strlen (use_gold_plugin), 0))
{
@@ -7172,8 +7182,8 @@
if (!gold_plugin_file_spec)
fatal ("-use-gold-plugin, but libLLVMgold.so not found.");
}
+#endif
/* LLVM LOCAL end */
-
/* Rebuild the COMPILER_PATH and LIBRARY_PATH environment variables
for collect. */
putenv_from_prefixes (&exec_prefixes, "COMPILER_PATH", false);
Modified: llvm-gcc-4.2/trunk/gcc/ipa.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ipa.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ipa.c (original)
+++ llvm-gcc-4.2/trunk/gcc/ipa.c Sat Feb 14 22:17:54 2009
@@ -112,8 +112,13 @@
#endif
for (node = cgraph_nodes; node; node = node->next)
if (node->needed && !node->global.inlined_to
- /* LLVM LOCAL extern inline */
+ /* LLVM LOCAL begin - extern inline */
+#ifdef ENABLE_LLVM
&& ((!IS_EXTERN_INLINE (node->decl))
+#else
+ && ((!DECL_EXTERNAL (node->decl))
+#endif
+ /* LLVM LOCAL end - extern inline */
|| !node->analyzed
|| before_inlining_p))
{
@@ -136,8 +141,13 @@
if (!e->callee->aux
&& node->analyzed
&& (!e->inline_failed || !e->callee->analyzed
- /* LLVM LOCAL extern inline */
+ /* LLVM LOCAL begin - extern inline */
+#ifdef ENABLE_LLVM
|| !IS_EXTERN_INLINE(e->callee->decl)
+#else
+ || (!DECL_EXTERNAL (e->callee->decl))
+#endif
+ /* LLVM LOCAL end - extern inline */
|| before_inlining_p))
{
e->callee->aux = first;
@@ -168,9 +178,13 @@
local_insns = 0;
if (file)
fprintf (file, " %s", cgraph_node_name (node));
- if (!node->analyzed
- /* LLVM LOCAL extern inline */
- || !IS_EXTERN_INLINE(node->decl)
+ /* LLVM LOCAL begin - extern inline */
+#ifdef ENABLE_LLVM
+ if (!node->analyzed || !IS_EXTERN_INLINE(node->decl)
+#else
+ if (!node->analyzed || !DECL_EXTERNAL (node->decl)
+#endif
+ /* LLVM LOCAL end - extern inline */
|| before_inlining_p)
cgraph_remove_node (node);
else
Modified: llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/objc/objc-act.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Sat Feb 14 22:17:54 2009
@@ -12492,7 +12492,7 @@
tree decl = TREE_PURPOSE (chain);
gcc_assert (TREE_CODE (expr) == PROTOCOL_INTERFACE_TYPE);
/* APPLE LOCAL begin radar 4695109 */
- /* APPLE LOCAL begin - LLVM radar 5476262 */
+ /* LLVM LOCAL begin - radar 5476262 */
#ifdef ENABLE_LLVM
if (flag_objc_abi == 2)
/* LLVM LOCAL - add 'l' prefix */
@@ -12525,15 +12525,17 @@
expr = start_var_decl (objc_v2_protocol_template, string);
}
#endif
- /* APPLE LOCAL end - LLVM radar 5476262 */
+ /* LLVM LOCAL end - radar 5476262 */
/* APPLE LOCAL end radar 4695109 */
expr = convert (objc_protocol_type, build_fold_addr_expr (expr));
finish_var_decl (decl, expr);
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* At -O0, we may have emitted references to the decl earlier. */
if (!optimize)
reset_initializer_llvm(decl);
#endif
+ /* LLVM LOCAL end */
}
}
@@ -19377,7 +19379,7 @@
/* APPLE LOCAL end radar 4810609 */
/* APPLE LOCAL begin radar 4810587 */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Darwin linker prefers to use 'L' as a prefix. GCC codegen handles this
later while emitting symbols, but fix it here for llvm. */
@@ -19386,7 +19388,7 @@
(integer_type_node,
build_index_type (build_int_cst (NULL_TREE, 2 - 1))));
#else
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
decl = build_decl (VAR_DECL, get_identifier ("_OBJC_IMAGE_INFO"),
build_array_type
(integer_type_node,
@@ -19407,13 +19409,13 @@
DECL_CONTEXT (decl) = 0;
DECL_ARTIFICIAL (decl) = 1;
DECL_INITIAL (decl) = initlist;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Let optimizer know that this decl is not removable. */
set_user_assembler_name(decl, IDENTIFIER_POINTER (DECL_NAME(decl)));
DECL_PRESERVE_P (decl) = 1;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
assemble_variable (decl, 1, 0, 0);
}
/* APPLE LOCAL end radar 4810587 */
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=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/optabs.c (original)
+++ llvm-gcc-4.2/trunk/gcc/optabs.c Sat Feb 14 22:17:54 2009
@@ -59,9 +59,11 @@
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/opts.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/opts.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/opts.c (original)
+++ llvm-gcc-4.2/trunk/gcc/opts.c Sat Feb 14 22:17:54 2009
@@ -906,9 +906,11 @@
break;
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
case OPT_mllvm:
llvm_optns = arg;
break;
+#endif
/* LLVM LOCAL end */
case OPT_auxbase_strip:
Modified: llvm-gcc-4.2/trunk/gcc/stub-objc.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/stub-objc.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/stub-objc.c (original)
+++ llvm-gcc-4.2/trunk/gcc/stub-objc.c Sat Feb 14 22:17:54 2009
@@ -80,11 +80,13 @@
/* APPLE LOCAL end radar 4330422 */
/* LLVM LOCAL begin radar 6551276 */
+#ifdef ENABLE_LLVM
tree
objc_build_volatilized_type (tree type)
{
return type;
}
+#endif
/* LLVM LOCAL end radar 6551276 */
/* APPLE LOCAL begin radar 4697411 */
Modified: llvm-gcc-4.2/trunk/gcc/target-def.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/target-def.h?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/target-def.h (original)
+++ llvm-gcc-4.2/trunk/gcc/target-def.h Sat Feb 14 22:17:54 2009
@@ -760,9 +760,11 @@
}
/* LLVM LOCAL begin sysroot */
+#ifdef ENABLE_LLVM
#ifndef TARGET_BUILD_SYSROOT_PATH
#define TARGET_BUILD_SYSROOT_PATH(S,P) default_build_sysroot_path((S), (P))
#endif
+#endif
/* LLVM LOCAL end sysroot */
#include "hooks.h"
#include "targhooks.h"
Modified: llvm-gcc-4.2/trunk/gcc/toplev.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/toplev.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/toplev.c (original)
+++ llvm-gcc-4.2/trunk/gcc/toplev.c Sat Feb 14 22:17:54 2009
@@ -259,8 +259,10 @@
int flag_short_enums;
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
/* Options to pass directly into the LLVM backend. */
const char *llvm_optns = 0;
+#endif
/* LLVM LOCAL end */
/* APPLE LOCAL begin -fast or -fastf or -fastcp */
@@ -1232,10 +1234,12 @@
break;
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
case 'M':
/* Ignore -dM. This is overloaded for rtl pass that
does not exist in llvm-gcc. */
break;
+#endif
/* LLVM LOCAL end */
case 'a':
default:
@@ -1842,9 +1846,11 @@
flag_profile_values = 1;
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
/* Disable verbose_asm flag if -emit-llvm is used, it's totally bogus then */
if (emit_llvm || emit_llvm_bc)
flag_verbose_asm = 0;
+#endif
/* LLVM LOCAL end */
/* Warn about options that are not supported on this machine. */
Modified: llvm-gcc-4.2/trunk/gcc/toplev.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/toplev.h?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/toplev.h (original)
+++ llvm-gcc-4.2/trunk/gcc/toplev.h Sat Feb 14 22:17:54 2009
@@ -131,7 +131,9 @@
/* APPLE LOCAL end optimization pragmas 3124235/3420242 */
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
extern const char *llvm_optns;
+#endif
/* LLVM LOCAL end */
/* Things to do with target switches. */
Modified: llvm-gcc-4.2/trunk/gcc/tree-nested.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree-nested.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree-nested.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tree-nested.c Sat Feb 14 22:17:54 2009
@@ -1808,7 +1808,7 @@
switch (TREE_CODE (t))
{
case ADDR_EXPR:
- /* LLVM local deleted 5 lines */
+ /* LLVM local deleted comment */
decl = TREE_OPERAND (t, 0);
if (TREE_CODE (decl) != FUNCTION_DECL)
Modified: llvm-gcc-4.2/trunk/gcc/tree-ssa-ccp.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree-ssa-ccp.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree-ssa-ccp.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tree-ssa-ccp.c Sat Feb 14 22:17:54 2009
@@ -2545,11 +2545,13 @@
}
fcode = DECL_FUNCTION_CODE (callee);
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
if (fcode != BUILT_IN_CONSTANT_P)
{
bsi_next (&i);
continue;
}
+#endif
/* LLVM LOCAL end */
result = ccp_fold_builtin (*stmtp, call);
@@ -2629,13 +2631,23 @@
0, /* static_pass_number */
0, /* tv_id */
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
PROP_cfg, /* properties_required */
+#else
+ PROP_cfg | PROP_ssa | PROP_alias, /* properties_required */
+#endif
/* LLVM LOCAL end */
0, /* properties_provided */
0, /* properties_destroyed */
0, /* todo_flags_start */
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
TODO_dump_func, /* todo_flags_finish */
+#else
+ TODO_dump_func
+ | TODO_verify_ssa
+ | TODO_update_ssa, /* todo_flags_finish */
+#endif
/* LLVM LOCAL end */
0 /* letter */
};
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=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tree.c Sat Feb 14 22:17:54 2009
@@ -6834,11 +6834,17 @@
tmp = tree_cons (NULL_TREE, ptr_type_node, tmp);
tmp = tree_cons (NULL_TREE, ptr_type_node, tmp);
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
ftype = build_function_type (ptr_type_node, tmp);
+#else
+ ftype = build_function_type (void_type_node, tmp);
+#endif
+ /* LLVM LOCAL end */
local_define_builtin ("__builtin_init_trampoline", ftype,
BUILT_IN_INIT_TRAMPOLINE,
"__builtin_init_trampoline", ECF_NOTHROW);
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
tmp = tree_cons (NULL_TREE, ptr_type_node, void_list_node);
ftype = build_function_type (ptr_type_node, tmp);
@@ -7942,6 +7948,7 @@
/* APPLE LOCAL end CW asm blocks */
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
/* This data structure keeps gcc's garbage collector from
deleting types created by the llvm virtual base class handling
stuff in llvm-types.cpp. */
@@ -7952,5 +7959,6 @@
{
VEC_safe_push(tree, gc, llvm_types_used, type);
}
+#endif
/* LLVM LOCAL end */
#include "gt-tree.h"
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=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree.h (original)
+++ llvm-gcc-4.2/trunk/gcc/tree.h Sat Feb 14 22:17:54 2009
@@ -2747,8 +2747,10 @@
#define DECL_FCONTEXT(NODE) (FIELD_DECL_CHECK (NODE)->field_decl.fcontext)
/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
/* In a FIELD_DECL, marks that the type is temporarily replaced in ConvertType. */
#define DECL_FIELD_REPLACED(NODE) (FIELD_DECL_CHECK (NODE)->decl_common.decl_flag_0)
+#endif
/* LLVM LOCAL end */
/* In a FIELD_DECL, indicates this field should be bit-packed. */
@@ -2916,8 +2918,12 @@
/* Used to indicate that this DECL has weak linkage. */
#define DECL_WEAK(NODE) (DECL_WITH_VIS_CHECK (NODE)->decl_with_vis.weak_flag)
+/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
#define DECL_LLVM_PRIVATE(NODE) \
(DECL_WITH_VIS_CHECK (NODE)->decl_with_vis.llvm_private_flag)
+#endif
+/* LLVM LOCAL end */
/* Internal to the gimplifier. Indicates that the value is a formal
temporary controlled by the gimplifier. */
@@ -3056,8 +3062,9 @@
unsigned seen_in_bind_expr : 1;
unsigned comdat_flag : 1;
- /* LLVM LOCAL */
+ /* LLVM LOCAL begin */
unsigned llvm_private_flag : 1;
+ /* LLVM LOCAL end */
ENUM_BITFIELD(symbol_visibility) visibility : 2;
unsigned visibility_specified : 1;
@@ -3079,7 +3086,7 @@
unsigned block_synthesized_function : 1;
/* APPLE LOCAL radar 5847976 */
unsigned block_weak : 1;
- /* 4 unused bits. */
+ /* 4 unused bits (llvm). */
/* APPLE LOCAL end radar 5932809 - copyable byref blocks */
/* APPLE LOCAL end radar 5732232 - blocks */
};
@@ -4395,8 +4402,11 @@
extern tree lower_bound_in_type (tree, tree);
extern int operand_equal_for_phi_arg_p (tree, tree);
extern bool empty_body_p (tree);
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
extern void llvm_note_type_used(tree);
+#endif
+/* LLVM LOCAL begin */
/* In stmt.c */
Modified: llvm-gcc-4.2/trunk/gcc/varasm.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/varasm.c?rev=64576&r1=64575&r2=64576&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/varasm.c (original)
+++ llvm-gcc-4.2/trunk/gcc/varasm.c Sat Feb 14 22:17:54 2009
@@ -6070,13 +6070,13 @@
const char *
default_strip_name_encoding (const char *str)
{
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
return str + (*str == '*');
#else
return str + (*str == '\1');
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
}
#ifdef ASM_OUTPUT_DEF
More information about the llvm-commits
mailing list