[llvm-commits] [llvm-gcc-4-2] r39798 - in /llvm-gcc-4-2/trunk: ./ fixincludes/ gcc/ gcc/ada/ gcc/autom4te.cache/ gcc/config/ gcc/config/arm/ gcc/config/i386/ gcc/config/ia64/ gcc/config/rs6000/ gcc/cp/ gcc/doc/ gcc/fortran/ gcc/java/ gcc/objc/ gcc/objcp/ libcpp/ libiberty/ libstdc++-v3/ libstdc++-v3/config/cpu/i486/ libstdc++-v3/config/cpu/powerpc/ libstdc++-v3/libsupc++/
Duncan Sands
baldrick at free.fr
Fri Jul 13 01:39:35 PDT 2007
Author: baldrick
Date: Fri Jul 13 03:39:34 2007
New Revision: 39798
URL: http://llvm.org/viewvc/llvm-project?rev=39798&view=rev
Log:
Change APPLE local LLVM markers to LLVM local.
Modified:
llvm-gcc-4-2/trunk/GNUmakefile
llvm-gcc-4-2/trunk/build_gcc
llvm-gcc-4-2/trunk/fixincludes/inclhack.def
llvm-gcc-4-2/trunk/gcc/Makefile.in
llvm-gcc-4-2/trunk/gcc/ada/misc.c
llvm-gcc-4-2/trunk/gcc/alias.c
llvm-gcc-4-2/trunk/gcc/autom4te.cache/output.0
llvm-gcc-4-2/trunk/gcc/bt-load.c
llvm-gcc-4-2/trunk/gcc/builtins.c
llvm-gcc-4-2/trunk/gcc/c-common.c
llvm-gcc-4-2/trunk/gcc/c-cppbuiltin.c
llvm-gcc-4-2/trunk/gcc/c-decl.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-pch.c
llvm-gcc-4-2/trunk/gcc/c-ppoutput.c
llvm-gcc-4-2/trunk/gcc/c-typeck.c
llvm-gcc-4-2/trunk/gcc/cgraph.c
llvm-gcc-4-2/trunk/gcc/cgraphunit.c
llvm-gcc-4-2/trunk/gcc/common.opt
llvm-gcc-4-2/trunk/gcc/config.gcc
llvm-gcc-4-2/trunk/gcc/config/arm/arm.c
llvm-gcc-4-2/trunk/gcc/config/arm/arm.h
llvm-gcc-4-2/trunk/gcc/config/arm/lib1funcs.asm
llvm-gcc-4-2/trunk/gcc/config/arm/t-bpabi
llvm-gcc-4-2/trunk/gcc/config/arm/t-symbian
llvm-gcc-4-2/trunk/gcc/config/darwin.c
llvm-gcc-4-2/trunk/gcc/config/darwin.h
llvm-gcc-4-2/trunk/gcc/config/freebsd-spec.h
llvm-gcc-4-2/trunk/gcc/config/i386/cygming.h
llvm-gcc-4-2/trunk/gcc/config/i386/darwin-libgcc.10.4.ver
llvm-gcc-4-2/trunk/gcc/config/i386/darwin-libgcc.10.5.ver
llvm-gcc-4-2/trunk/gcc/config/i386/darwin.h
llvm-gcc-4-2/trunk/gcc/config/i386/i386.c
llvm-gcc-4-2/trunk/gcc/config/i386/i386.h
llvm-gcc-4-2/trunk/gcc/config/i386/linux.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/config/ia64/ia64.h
llvm-gcc-4-2/trunk/gcc/config/linux.h
llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-ldouble.c
llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-libgcc.10.4.ver
llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-libgcc.10.5.ver
llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin.h
llvm-gcc-4-2/trunk/gcc/config/rs6000/llvm-rs6000.cpp
llvm-gcc-4-2/trunk/gcc/config/rs6000/rs6000.c
llvm-gcc-4-2/trunk/gcc/config/rs6000/rs6000.h
llvm-gcc-4-2/trunk/gcc/config/rs6000/t-darwin8
llvm-gcc-4-2/trunk/gcc/configure
llvm-gcc-4-2/trunk/gcc/configure.ac
llvm-gcc-4-2/trunk/gcc/configure.merged
llvm-gcc-4-2/trunk/gcc/cp/Make-lang.in
llvm-gcc-4-2/trunk/gcc/cp/class.c
llvm-gcc-4-2/trunk/gcc/cp/decl.c
llvm-gcc-4-2/trunk/gcc/cp/decl2.c
llvm-gcc-4-2/trunk/gcc/cp/lang-specs.h
llvm-gcc-4-2/trunk/gcc/cp/method.c
llvm-gcc-4-2/trunk/gcc/cp/parser.c
llvm-gcc-4-2/trunk/gcc/cp/pt.c
llvm-gcc-4-2/trunk/gcc/cp/typeck.c
llvm-gcc-4-2/trunk/gcc/crtstuff.c
llvm-gcc-4-2/trunk/gcc/cse.c
llvm-gcc-4-2/trunk/gcc/doc/invoke.texi
llvm-gcc-4-2/trunk/gcc/emit-rtl.c
llvm-gcc-4-2/trunk/gcc/expr.c
llvm-gcc-4-2/trunk/gcc/expr.h
llvm-gcc-4-2/trunk/gcc/final.c
llvm-gcc-4-2/trunk/gcc/flags.h
llvm-gcc-4-2/trunk/gcc/fold-const.c
llvm-gcc-4-2/trunk/gcc/fortran/Make-lang.in
llvm-gcc-4-2/trunk/gcc/fortran/f95-lang.c
llvm-gcc-4-2/trunk/gcc/fortran/trans-decl.c
llvm-gcc-4-2/trunk/gcc/function.c
llvm-gcc-4-2/trunk/gcc/gcc.c
llvm-gcc-4-2/trunk/gcc/gimplify.c
llvm-gcc-4-2/trunk/gcc/global.c
llvm-gcc-4-2/trunk/gcc/java/Make-lang.in
llvm-gcc-4-2/trunk/gcc/libgcc2.c
llvm-gcc-4-2/trunk/gcc/llvm-abi.h
llvm-gcc-4-2/trunk/gcc/llvm-backend.cpp
llvm-gcc-4-2/trunk/gcc/llvm-convert.cpp
llvm-gcc-4-2/trunk/gcc/llvm-debug.cpp
llvm-gcc-4-2/trunk/gcc/llvm-debug.h
llvm-gcc-4-2/trunk/gcc/llvm-file-ostream.h
llvm-gcc-4-2/trunk/gcc/llvm-internal.h
llvm-gcc-4-2/trunk/gcc/llvm-linker-hack.cpp
llvm-gcc-4-2/trunk/gcc/llvm-types.cpp
llvm-gcc-4-2/trunk/gcc/llvm.h
llvm-gcc-4-2/trunk/gcc/longlong.h
llvm-gcc-4-2/trunk/gcc/objc/Make-lang.in
llvm-gcc-4-2/trunk/gcc/objc/config-lang.in
llvm-gcc-4-2/trunk/gcc/objc/lang-specs.h
llvm-gcc-4-2/trunk/gcc/objc/objc-act.c
llvm-gcc-4-2/trunk/gcc/objcp/Make-lang.in
llvm-gcc-4-2/trunk/gcc/objcp/lang-specs.h
llvm-gcc-4-2/trunk/gcc/optabs.c
llvm-gcc-4-2/trunk/gcc/opts.c
llvm-gcc-4-2/trunk/gcc/passes.c
llvm-gcc-4-2/trunk/gcc/print-tree.c
llvm-gcc-4-2/trunk/gcc/recog.c
llvm-gcc-4-2/trunk/gcc/reload1.c
llvm-gcc-4-2/trunk/gcc/simplify-rtx.c
llvm-gcc-4-2/trunk/gcc/stor-layout.c
llvm-gcc-4-2/trunk/gcc/stub-c.c
llvm-gcc-4-2/trunk/gcc/system.h
llvm-gcc-4-2/trunk/gcc/target-def.h
llvm-gcc-4-2/trunk/gcc/timevar.def
llvm-gcc-4-2/trunk/gcc/toplev.c
llvm-gcc-4-2/trunk/gcc/toplev.h
llvm-gcc-4-2/trunk/gcc/tree-gimple.c
llvm-gcc-4-2/trunk/gcc/tree-inline.c
llvm-gcc-4-2/trunk/gcc/tree-nested.c
llvm-gcc-4-2/trunk/gcc/tree-optimize.c
llvm-gcc-4-2/trunk/gcc/tree-pretty-print.c
llvm-gcc-4-2/trunk/gcc/tree.c
llvm-gcc-4-2/trunk/gcc/tree.h
llvm-gcc-4-2/trunk/gcc/unwind-c.c
llvm-gcc-4-2/trunk/gcc/varasm.c
llvm-gcc-4-2/trunk/libcpp/Makefile.in
llvm-gcc-4-2/trunk/libcpp/configure
llvm-gcc-4-2/trunk/libcpp/configure.ac
llvm-gcc-4-2/trunk/libcpp/system.h
llvm-gcc-4-2/trunk/libiberty/strsignal.c
llvm-gcc-4-2/trunk/libstdc++-v3/acinclude.m4
llvm-gcc-4-2/trunk/libstdc++-v3/config/cpu/i486/atomicity.h
llvm-gcc-4-2/trunk/libstdc++-v3/config/cpu/powerpc/atomic_word.h
llvm-gcc-4-2/trunk/libstdc++-v3/configure
llvm-gcc-4-2/trunk/libstdc++-v3/libsupc++/eh_personality.cc
llvm-gcc-4-2/trunk/libstdc++-v3/libsupc++/unwind-cxx.h
Modified: llvm-gcc-4-2/trunk/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/GNUmakefile?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/GNUmakefile (original)
+++ llvm-gcc-4-2/trunk/GNUmakefile Fri Jul 13 03:39:34 2007
@@ -34,7 +34,7 @@
#######################################################################
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
# LLVM defaults to enabled.
ifndef DISABLE_LLVM
ENABLE_LLVM = true
@@ -65,7 +65,7 @@
$(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) $(ENABLE_LLVM) \
$(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) \
$(LLVM_ASSERTIONS)
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# installhdrs does nothing, because the headers aren't useful until
# the compiler is installed.
@@ -83,7 +83,7 @@
if [ $(SRCROOT) != . ]; then \
$(PAX) -rw . $(SRCROOT); \
fi
- # APPLE LOCAL begin LLVM: Avoid verification error due to binaries in libjava.
+ # LLVM LOCAL begin: Avoid verification error due to binaries in libjava.
rm -rf "$(SRCROOT)/libjava/"
find -d "$(SRCROOT)" \( -type d -a -name CVS -o \
-type f -a -name .DS_Store -o \
Modified: llvm-gcc-4-2/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/build_gcc?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/build_gcc (original)
+++ llvm-gcc-4-2/trunk/build_gcc Fri Jul 13 03:39:34 2007
@@ -22,7 +22,7 @@
# installed.
TARGETS=`echo $2 | $TRANSLATE_ARCH`
-#APPLE LOCAL begin LLVM
+#LLVM LOCAL begin
# LLVM does not require host name translation.
LLVM_HOSTS=$1
# LLVM target list is comma separated list.
@@ -30,7 +30,7 @@
# -e s/x86_64// -e s/powerpc64// -e s/ppc64//`
#FIXME : Hard code targets. See LLVMTARGETOBJ comment in gcc/Makefile.in
LLVM_TARGETS="x86,powerpc"
-#APPLE LOCAL end LLVM
+#LLVM LOCAL end
# The GNU makefile target ('bootstrap' by default).
BOOTSTRAP=${BOOTSTRAP-bootstrap}
@@ -67,7 +67,7 @@
# the resulting compiler.
SYM_DIR="$6"
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
# The seventh parameter is true/false indicating whether LLVM should be enabled
# or not.
ENABLE_LLVM="$7"
@@ -92,7 +92,7 @@
LLVM_ARCHS="ppc i386 ppc64 x86_64"
fi
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# The current working directory is where the build will happen.
# It may already contain a partial result of an interrupted build,
@@ -111,12 +111,12 @@
# to be built. It's VERS but only up to the second '.' (if there is one).
MAJ_VERS=`echo $VERS | sed 's/\([0-9]*\.[0-9]*\)[.-].*/\1/'`
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
if [ "$ENABLE_LLVM" == true ]; then
# Add suffix.
MAJ_VERS="${MAJ_VERS}-llvm"
fi
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# This is the libstdc++ version to use.
LIBSTDCXX_VERSION=4.0.0
@@ -138,7 +138,7 @@
ln -s $ORIG_SRC_DIR/* $SRC_DIR/ || exit 1
rm -rf $SRC_DIR/tcl $SRC_DIR/expect $SRC_DIR/dejagnu || exit 1
-# APPLE LOCAL begin LLVM Must build libstdc++ to install in /usr/local.
+# LLVM LOCAL begin Must build libstdc++ to install in /usr/local.
LIBSTDCXX_CONFIG_OPTION=
# Also remove libstdc++ since it is built from a separate project.
rm -rf $SRC_DIR/libstdc++-v3 || exit 1
@@ -148,10 +148,10 @@
# Clean out old specs files
rm -f /usr/lib/gcc/*/4.0.0/specs
fi
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# These are the configure and build flags that are used.
-# APPLE LOCAL begin LLVM Support for non /usr $DEST_ROOT, use libstdc++
+# LLVM LOCAL begin Support for non /usr $DEST_ROOT, use libstdc++
CONFIGFLAGS="--disable-checking --enable-werror \
--prefix=$DEST_ROOT \
@@ -161,9 +161,9 @@
$LIBSTDCXX_CONFIG_OPTION \
--with-slibdir=/usr/lib \
--build=$BUILD-apple-darwin$DARWIN_VERS"
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
if [ "$ENABLE_LLVM" == true ]; then
CONFIGFLAGS="$CONFIGFLAGS --enable-llvm=$DIR/obj-llvm"
@@ -196,7 +196,7 @@
exit 1
fi
fi
-# APPLE LOCAL LLVM end
+# LLVM LOCAL end
# Figure out how many make processes to run.
SYSCTL=`sysctl -n hw.activecpu`
@@ -216,7 +216,7 @@
# The $LOCAL_MAKEFLAGS variable can be used to override $MAKEFLAGS.
MAKEFLAGS=${LOCAL_MAKEFLAGS-"-j $SYSCTL"}
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
if [ "$ENABLE_LLVM" == true ]; then
# Build llvm-gcc in 'dylib mode'.
MAKEFLAGS="$MAKEFLAGS BUILD_LLVM_INTO_A_DYLIB=1"
@@ -226,7 +226,7 @@
MAKEFLAGS="$MAKEFLAGS DISABLE_LLVMASSERTIONS=1"
fi
fi
-# APPLE LOCAL LLVM end
+# LLVM LOCAL end
# Build the native GCC. Do this even if the user didn't ask for it
# because it'll be needed for the bootstrap.
@@ -244,11 +244,11 @@
CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" || exit 1
# Add the compiler we just built to the path, giving it appropriate names.
-# APPLE LOCAL LLVM Support for non /usr $DEST_ROOT
+# LLVM LOCAL Support for non /usr $DEST_ROOT
D=$DIR/dst-$BUILD-$BUILD$DEST_ROOT/bin
ln -f $D/gcc-$MAJ_VERS $D/gcc || exit 1
ln -f $D/gcc $D/$BUILD-apple-darwin$DARWIN_VERS-gcc || exit 1
-# APPLE LOCAL LLVM Support for non /usr $DEST_ROOT
+# LLVM LOCAL Support for non /usr $DEST_ROOT
PATH=$DIR/dst-$BUILD-$BUILD$DEST_ROOT/bin:$PATH
# The cross-tools' build process expects to find certain programs
@@ -290,7 +290,7 @@
make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-$t install-gcc install-target \
CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" || exit 1
# Add the compiler we just built to the path.
-# APPLE LOCAL LLVM Support for non /usr $DEST_ROOT
+# LLVM LOCAL Support for non /usr $DEST_ROOT
PATH=$DIR/dst-$BUILD-$t/$DEST_ROOT/bin:$PATH
fi
done
@@ -298,7 +298,7 @@
# Rearrange various libraries, for no really good reason.
for t in $TARGETS ; do
DT=$DIR/dst-$BUILD-$t
-# APPLE LOCAL begin LLVM Support for non /usr $DEST_ROOT
+# LLVM LOCAL begin Support for non /usr $DEST_ROOT
D=`echo $DT/$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS`
mv $D/static/libgcc.a $D/libgcc_static.a || exit 1
mv $D/kext/libgcc.a $D/libcc_kext.a || exit 1
@@ -344,7 +344,7 @@
# Clean out DEST_DIR in case -noclean was passed to buildit.
rm -rf * || exit 1
-# APPLE LOCAL LLVM Don't install HTML docs.
+# LLVM LOCAL Don't install HTML docs.
if [ "$ENABLE_LLVM" == false ]; then
# HTML documentation
HTMLDIR="/Developer/Documentation/DocSets/com.apple.ADC_Reference_Library.DeveloperTools.docset/Contents/Resources/Documents/documentation/DeveloperTools"
@@ -353,7 +353,7 @@
# Manual pages
mkdir -p .$DEST_ROOT/share || exit 1
-# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
+# LLVM LOCAL build_gcc bug with non-/usr $DEST_ROOT
cp -Rp $DIR/dst-$BUILD-$BUILD/$DEST_ROOT/share/man .$DEST_ROOT/share/ \
|| exit 1
# exclude fsf-funding.7 gfdl.7 gpl.7 as they are currently built in
@@ -361,7 +361,7 @@
rm -rf .$DEST_ROOT/share/man/man7
# libexec
-# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
+# LLVM LOCAL build_gcc bug with non-/usr $DEST_ROOT
cd $DIR/dst-$BUILD-$BUILD/$DEST_ROOT/libexec/gcc/$BUILD-apple-darwin$DARWIN_VERS/$VERS \
|| exit 1
LIBEXEC_FILES=`find . -type f -print || exit 1`
@@ -369,18 +369,18 @@
cd $DEST_DIR || exit 1
for t in $TARGETS ; do
DL=$DEST_ROOT/libexec/gcc/$t-apple-darwin$DARWIN_VERS/$VERS
- # APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
+ # LLVM LOCAL build_gcc bug with non-/usr $DEST_ROOT
SL=/$DEST_ROOT/libexec/gcc/$t-apple-darwin$DARWIN_VERS/$VERS
for d in $LIBEXEC_DIRS ; do
mkdir -p .$DL/$d || exit 1
done
for f in $LIBEXEC_FILES ; do
-# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT, allow dynamically linked shared libs.
+# LLVM LOCAL build_gcc bug with non-/usr $DEST_ROOT, allow dynamically linked shared libs.
if file $DIR/dst-*-$t$SL/$f | grep -q -E 'Mach-O (executable|dynamically linked shared library)' ; then
-# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
+# LLVM LOCAL build_gcc bug with non-/usr $DEST_ROOT
lipo -output .$DL/$f -create $DIR/dst-*-$t$SL/$f || exit 1
else
-# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
+# LLVM LOCAL build_gcc bug with non-/usr $DEST_ROOT
cp -p $DIR/dst-$BUILD-$t$SL/$f .$DL/$f || exit 1
fi
done
@@ -394,21 +394,21 @@
| grep -v gccbug | grep -v gcov || exit 1`
mkdir .$DEST_ROOT/bin
for f in $BIN_FILES ; 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/$f -create $DIR/dst-*/$DEST_ROOT/bin/$f || exit 1
done
# gcov, which is special only because it gets built multiple times and lipo
# will complain if we try to add two architectures into the same output.
TARG0=`echo $TARGETS | cut -d ' ' -f 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/gcov-$MAJ_VERS -create \
$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-gcc-$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-g++-$VERS -create \
$DIR/dst-*-$t/$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-g++* || exit 1
done
@@ -416,7 +416,7 @@
# lib
mkdir -p .$DEST_ROOT/lib/gcc || exit 1
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
cp -Rp $DIR/dst-$BUILD-$t/$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS \
.$DEST_ROOT/lib/gcc || exit 1
done
@@ -448,7 +448,7 @@
cp -p /usr/lib/libstdc++.6.dylib \
.$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/libstdc++.dylib \
|| exit 1
-# APPLE LOCAL LLVM
+# LLVM LOCAL
# strip -x -c .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/libstdc++.dylib || exit 1
done
@@ -547,15 +547,15 @@
find $DEST_DIR -perm -0111 \! -name \*.dylib \! -name fixinc.sh \
\! -name mkheaders \! -name libstdc++.dylib -type f -print \
| xargs strip || exit 1
-# APPLE LOCAL begin LLVM - Strip with -Sx instead of -SX
+# LLVM LOCAL begin - Strip with -Sx instead of -SX
find $DEST_DIR \( -name \*.a -or -name \*.dylib \) \
\! -name libgcc_s.10.*.dylib -type f -print \
| xargs strip -SX || exit 1
-# APPLE LOCAL end LLVM - Strip with -Sx instead of -SX
+# LLVM LOCAL end - Strip with -Sx instead of -SX
find $DEST_DIR -name \*.a -type f -print \
| xargs ranlib || exit 1
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
# Install LLVM libraries/headers/tools.
if [ "$ENABLE_LLVM" == true ]; then
cd $DIR/obj-llvm || exit 1
@@ -623,7 +623,7 @@
ln -s ../../libllvmgcc.dylib
done
fi
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
find $DEST_DIR -name \*.dSYM -print | xargs rm -r || exit 1
chgrp -h -R wheel $DEST_DIR
Modified: llvm-gcc-4-2/trunk/fixincludes/inclhack.def
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/fixincludes/inclhack.def?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/fixincludes/inclhack.def (original)
+++ llvm-gcc-4-2/trunk/fixincludes/inclhack.def Fri Jul 13 03:39:34 2007
@@ -2520,7 +2520,7 @@
};
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
/* We need to fix complex.h not to include inline FP assembly.
* This is needed to workaround PR879
*/
@@ -2534,7 +2534,7 @@
test_text = ' __asm__ ("fpatan;"'
' : "=t" (res) : "0" (__real__ _Z), "u" (__imag__ _Z) : "st(1)");';
};
-/* APPLE local end LLVM */
+/* LLVM local end */
/*
* nested comment
Modified: llvm-gcc-4-2/trunk/gcc/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/Makefile.in?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/Makefile.in (original)
+++ llvm-gcc-4-2/trunk/gcc/Makefile.in Fri Jul 13 03:39:34 2007
@@ -55,9 +55,9 @@
.SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo
-# APPLE LOCAL begin llvm
+# LLVM LOCAL begin
.SUFFIXES: .cpp
-# APPLE LOCAL end llvm
+# LLVM LOCAL end
# -------------------------------
# Standard autoconf-set variables
@@ -227,7 +227,7 @@
# $(GCC_WARN_CFLAGS), or nothing.
WARN_CFLAGS = @warn_cflags@
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
@checkingenabled_flag@
LLVMOBJDIR = @LLVMBASEPATH@
ifeq ($(LLVMOBJDIR),)
@@ -254,7 +254,7 @@
# srcdir != objdir builds.
LLVMSRCDIR := $(shell $(LLVMBINPATH)/llvm-config --src-root)
endif
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# These exists to be overridden by the x-* and t-* files, respectively.
X_CFLAGS =
@@ -459,10 +459,10 @@
xmake_file=@xmake_file@
tmake_file=@tmake_file@
out_file=$(srcdir)/config/@out_file@
-# APPLE LOCAL LLVM
+# LLVM LOCAL
out_cxx_file=@out_cxx_file@
out_object_file=@out_object_file@
-# APPLE LOCAL LLVM
+# LLVM LOCAL
out_cxx_object_file=@out_cxx_object_file@
md_file=$(srcdir)/config/@md_file@
tm_file_list=@tm_file_list@
@@ -920,7 +920,7 @@
-I$(srcdir)/../include @INCINTL@ \
$(CPPINC) $(GMPINC) $(DECNUMINC)
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
ifneq ($(LLVMOBJDIR),)
INCLUDES += -I$(LLVMSRCDIR)/include
@@ -930,11 +930,11 @@
INCLUDES += -I$(LLVMOBJDIR)/include
endif
endif
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
.c.o:
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $< $(OUTPUT_OPTION)
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
# Disable C-only warning flags if they are present.
ALL_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wmissing-prototypes \
-Wold-style-definition, $(ALL_CFLAGS)) -Wno-unused
@@ -947,7 +947,7 @@
.cpp.o:
$(CXX) -c $(ALL_CXXFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
#
# Support for additional languages (other than C).
@@ -1097,20 +1097,20 @@
OBJS-md = $(out_object_file)
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
ifneq ($(out_cxx_file),)
ifneq ($(LLVMOBJDIR),)
OBJC-md += $(out_cxx_object_file)
endif
endif
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
OBJS-archive = $(EXTRA_OBJS) $(host_hook_obj) tree-inline.o \
cgraph.o cgraphunit.o tree-nomudflap.o ipa.o ipa-inline.o \
ipa-utils.o ipa-reference.o ipa-pure-const.o ipa-type-escape.o \
ipa-prop.o ipa-cp.o
OBJS = $(OBJS-common) $(out_object_file) $(OBJS-archive)
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
ifneq ($(LLVMOBJDIR),)
OBJS-common += llvm-backend.o llvm-convert.o llvm-types.o llvm-debug.o
endif
@@ -1161,12 +1161,12 @@
LIBDEPS += $(LLVMLIBFILES)
LLVMBACKENDFILES := $(LLVMLIBFILES)
-# APPLE LOCAL begin LLVM - set DYLD path
+# LLVM LOCAL begin - set DYLD path
SET_DYLIB_PATH=0
# Set up library path if needed.
##@set_gcc_lib_path@
-# APPLE LOCAL end LLVM - set DYLD path
+# LLVM LOCAL end - set DYLD path
else
# Remove scheduler files.
@@ -1177,12 +1177,12 @@
OBJS-common := $(filter-out bt-load.o caller-save.o combine.o cse.o ifcvt.o \
simplify-rtx.o, $(OBJS-common))
-# APPLE LOCAL begin LLVM - Remove gcse.o
+# LLVM LOCAL begin - Remove gcse.o
# Remove RTL optimization that requires a function we don't link in.
ifdef BUILD_LLVM_INTO_A_DYLIB
OBJS-common := $(filter-out gcse.o, $(OBJS-common))
endif
-# APPLE LOCAL end LLVM - Remove gcse.o
+# LLVM LOCAL end - Remove gcse.o
# Remove generated files.
OBJS-common := $(filter-out insn-attrtab.o insn-recog.o insn-extract.o, \
@@ -1206,31 +1206,31 @@
# Make sure that 'make install' knows about the dylib.
EXTRA_PROGRAMS += libllvmgcc$(LLVM_STAGE).dylib
-# APPLE LOCAL begin LLVM - set DYLD path
+# LLVM LOCAL begin - set DYLD path
SET_DYLIB_PATH=1
-# APPLE LOCAL end LLVM - set DYLD path
+# LLVM LOCAL end - set DYLD path
endif
endif
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
OBJS = $(OBJS-common) $(out_object_file) $(OBJS-archive)
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
ifneq ($(out_cxx_file),)
ifneq ($(LLVMOBJDIR),)
OBJS += $(out_cxx_object_file)
endif
endif
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
OBJS-onestep = libbackend.o $(OBJS-archive)
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
ifneq ($(LLVMOBJDIR),)
MAIN_OBJ = llvm-main.o
else
MAIN_OBJ = main.o
endif
BACKEND = $(MAIN_OBJ) @TREEBROWSER@ libbackend.a $(CPPLIB) $(LLVMBACKENDFILES)
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# Files to be copied after each stage in building.
STAGECOPYSTUFF = insn-flags.h insn-config.h insn-codes.h \
@@ -1504,7 +1504,7 @@
$(AR) $(AR_FLAGS) libbackend.a $(OBJS at onestep@)
-$(RANLIB) $(RANLIB_FLAGS) libbackend.a
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
ifneq ($(LLVMOBJDIR),)
# Link with the C++ compiler, not the C compiler.
LINKCC := $(CXX)
@@ -1520,7 +1520,7 @@
else
LINKCC := $(CC)
endif
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# We call this executable `xgcc' rather than `gcc'
# to avoid confusion if the current directory is in the path
@@ -1823,10 +1823,10 @@
c-objc-common.h $(C_PRAGMA_H) c-common.def $(TREE_INLINE_H)
stub-objc.o : stub-objc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
$(C_COMMON_H)
-# APPLE LOCAL begin llvm
+# LLVM LOCAL begin
stub-c.o : stub-c.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
$(GGC_H) $(C_COMMON_H)
-# APPLE LOCAL end llvm
+# LLVM LOCAL end
c-lex.o : c-lex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
$(RTL_H) debug.h $(C_TREE_H) $(C_COMMON_H) $(REAL_H) $(SPLAY_TREE_H) \
$(C_PRAGMA_H) input.h intl.h $(FLAGS_H) toplev.h output.h \
@@ -1858,7 +1858,7 @@
COLLECT2_LIBS = @COLLECT2_LIBS@
collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS)
# Don't try modifying collect2 (aka ld) in place--it might be linking this.
- # APPLE LOCAL LLVM
+ # LLVM LOCAL
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o T$@ \
$(COLLECT2_OBJS) $(LIBS) $(COLLECT2_LIBS)
mv -f T$@ $@
@@ -2898,7 +2898,7 @@
$(TREE_H)
errors.o : errors.c $(CONFIG_H) $(SYSTEM_H) errors.h $(BCONFIG_H)
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
llvm-main.o : llvm-main.cpp $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h
llvm-symbol-stubs.o : llvm-symbol-stubs.cpp
LLVM_HEADERS := $(wildcard $(LLVMSRCDIR)/include/llvm/*) \
@@ -2912,7 +2912,7 @@
$(LLVMSRCDIR)/include/llvm/Intrinsics.gen
llvm-types.o : llvm-types.cpp $(ALL_HEADERS)
llvm-debug.o : llvm-debug.cpp $(ALL_HEADERS)
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
$(out_object_file): $(out_file) $(CONFIG_H) coretypes.h $(TM_H) $(TREE_H) \
$(RTL_H) $(REGS_H) hard-reg-set.h insn-config.h conditions.h \
@@ -2921,7 +2921,7 @@
langhooks.h $(GGC_H) $(OPTABS_H) $(REAL_H) tm-constrs.h
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
$(out_file) $(OUTPUT_OPTION)
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
ifneq ($(out_cxx_file),)
$(out_cxx_object_file): $(srcdir)/config/$(out_cxx_file) $(ALL_HEADERS) $(TREE_H) $(GGC_H) \
$(RTL_H) $(REGS_H) hard-reg-set.h real.h insn-config.h conditions.h \
@@ -2931,7 +2931,7 @@
$(CXX) -c $(ALL_CXXFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
$(srcdir)/config/$(out_cxx_file) $(OUTPUT_OPTION)
endif
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# Build auxiliary files that support ecoff format.
mips-tfile: mips-tfile.o version.o $(LIBDEPS)
@@ -2946,11 +2946,11 @@
mips-tdump.o : mips-tdump.c $(CONFIG_H) $(RTL_H) $(SYSTEM_H) coretypes.h \
$(TM_H) version.h $(srcdir)/../include/getopt.h stab.def
-# APPLE LOCAL LLVM - Disable rule, which expects OBJS-common to only have C Files.
+# LLVM LOCAL - Disable rule, which expects OBJS-common to only have C Files.
ifeq ($(LLVMOBJDIR),)
# FIXME: writing proper dependencies for this is a *LOT* of work.
-# APPLE LOCAL LLVM
+# LLVM LOCAL
libbackend.o : $(OBJS-common:.o=.c) $(out_file) $(out_cxx_file) \
insn-config.h insn-flags.h insn-codes.h insn-constants.h \
insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE)
@@ -2961,7 +2961,7 @@
-DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
-DDEVPHASE=$(DEVPHASE_s) -combine
-# APPLE LOCAL LLVM
+# LLVM LOCAL
endif
#
@@ -3170,11 +3170,11 @@
$(srcdir)/targhooks.c $(srcdir)/cgraphunit.c $(out_file) \
@all_gtfiles@
-# APPLE LOCAL begin LLVM - Remove gcse.c
+# LLVM LOCAL begin - Remove gcse.c
ifdef BUILD_LLVM_INTO_A_DYLIB
GTFILES := $(filter-out $(srcdir)/gcse.c, $(GTFILES))
endif
-# APPLE LOCAL end LLVM - Remove gcse.c
+# LLVM LOCAL end - Remove gcse.c
GTFILES_FILES_LANGS = @all_gtfiles_files_langs@
GTFILES_FILES_FILES = @all_gtfiles_files_files@
@@ -3388,11 +3388,11 @@
PROTO_OBJS = intl.o version.o cppdefault.o errors.o
protoize$(exeext): protoize.o $(PROTO_OBJS) $(LIBDEPS)
- # APPLE LOCAL LLVM
+ # LLVM LOCAL
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ protoize.o $(PROTO_OBJS) $(LIBS)
unprotoize$(exeext): unprotoize.o $(PROTO_OBJS) $(LIBDEPS)
- # APPLE LOCAL LLVM
+ # LLVM LOCAL
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ unprotoize.o $(PROTO_OBJS) $(LIBS)
protoize.o: protoize.c $(srcdir)/../include/getopt.h $(CONFIG_H) $(SYSTEM_H) \
Modified: llvm-gcc-4-2/trunk/gcc/ada/misc.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/ada/misc.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/ada/misc.c (original)
+++ llvm-gcc-4-2/trunk/gcc/ada/misc.c Fri Jul 13 03:39:34 2007
@@ -500,9 +500,9 @@
using_eh_for_cleanups ();
eh_personality_libfunc = init_one_libfunc ("__gnat_eh_personality");
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
default_init_unwind_resume_libfunc ();
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
lang_eh_type_covers = gnat_eh_type_covers;
lang_eh_runtime_type = gnat_eh_runtime_type;
default_init_unwind_resume_libfunc ();
Modified: llvm-gcc-4-2/trunk/gcc/alias.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/alias.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/alias.c (original)
+++ llvm-gcc-4-2/trunk/gcc/alias.c Fri Jul 13 03:39:34 2007
@@ -580,7 +580,7 @@
/* If we've already determined the alias set for a decl, just return
it. This is necessary for C++ anonymous unions, whose component
variables don't look like union members (boo!). */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
if (TREE_CODE (t) == VAR_DECL
&& DECL_RTL_SET_P (t) && MEM_P (DECL_RTL (t)))
@@ -590,7 +590,7 @@
&& DECL_LLVM_SET_P (t))
return 0;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* Now all we care about is the type. */
t = TREE_TYPE (t);
Modified: llvm-gcc-4-2/trunk/gcc/autom4te.cache/output.0
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/autom4te.cache/output.0?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/autom4te.cache/output.0 (original)
+++ llvm-gcc-4-2/trunk/gcc/autom4te.cache/output.0 Fri Jul 13 03:39:34 2007
@@ -6540,7 +6540,7 @@
IFS="$ac_save_IFS"
nocommon_flag=""
-# APPLE LOCAL llvm
+# LLVM LOCAL
# Expose a flag in the makefile so we can tell when ENABLE_CHECKING is set.
checkingenabled_flag=""
if test x$ac_checking != x ; then
@@ -6550,10 +6550,10 @@
_ACEOF
nocommon_flag=-fno-common
- # APPLE LOCAL llvm
+ # LLVM LOCAL
checkingenabled_flag=CHECKING_ENABLED=1
fi
-# APPLE LOCAL llvm
+# LLVM LOCAL
if test x$ac_assert_checking != x ; then
@@ -7200,7 +7200,7 @@
fi;
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
# See if dsymutil has been installed and is modern enough
# that we can use DWARF.
@@ -7384,7 +7384,7 @@
LLVMBASEPATH=""
fi;
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# Sanity check enable_languages in case someone does not run the toplevel
# configure # script.
@@ -12565,7 +12565,7 @@
# Say what files are being used for the output code and MD file.
echo "Using \`$srcdir/config/$out_file' for machine-specific logic."
-# APPLE LOCAL llvm
+# LLVM LOCAL
echo "Using \`$srcdir/config/$out_cxx_file' for machine-specific C++ logic."
echo "Using \`$srcdir/config/$md_file' as machine description file."
@@ -13412,7 +13412,7 @@
out_object_file=`basename $out_file .c`.o
-# APPLE LOCAL LLVM
+# LLVM LOCAL
out_cxx_object_file=`basename $out_cxx_file .cpp`.o
tm_file_list="options.h"
@@ -16963,10 +16963,10 @@
-# APPLE LOCAL llvm
+# LLVM LOCAL
-# APPLE LOCAL llvm
+# LLVM LOCAL
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/bt-load.c (original)
+++ llvm-gcc-4-2/trunk/gcc/bt-load.c Fri Jul 13 03:39:34 2007
@@ -1504,11 +1504,11 @@
rest_of_handle_branch_target_load_optimize (void)
{
static int warned = 0;
-/* APPLE LOCAL begin LLVM - reduce cc1 size. */
+/* LLVM LOCAL begin - reduce cc1 size. */
#ifdef ENABLE_LLVM
return;
#endif
-/* APPLE LOCAL end LLVM. */
+/* LLVM LOCAL end. */
/* 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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/builtins.c (original)
+++ llvm-gcc-4-2/trunk/gcc/builtins.c Fri Jul 13 03:39:34 2007
@@ -71,7 +71,7 @@
required to implement the function call in all cases). */
tree implicit_built_in_decls[(int) END_BUILTINS];
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
int get_pointer_alignment (tree, unsigned int);
static const char *c_getstr (tree);
static rtx c_readstr (const char *, enum machine_mode);
@@ -140,9 +140,9 @@
static tree fold_builtin_strlen (tree);
static tree fold_builtin_inf (tree, int);
static tree fold_builtin_nan (tree, tree, int);
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
int validate_arglist (tree, ...);
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
static bool integer_valued_real_p (tree);
static tree fold_trunc_transparent_mathfn (tree, tree);
static bool readonly_data_expr (tree);
@@ -230,7 +230,7 @@
Otherwise, look at the expression to see if we can do better, i.e., if the
expression is actually pointing at an object whose alignment is tighter. */
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
int
get_pointer_alignment (tree exp, unsigned int max_align)
{
@@ -5681,11 +5681,11 @@
enum built_in_function fcode = DECL_FUNCTION_CODE (fndecl);
enum machine_mode target_mode = TYPE_MODE (TREE_TYPE (exp));
- /* APPLE LOCAL begin LLVM - cc1 code size. */
+ /* LLVM LOCAL begin - cc1 code size. */
#ifdef ENABLE_LLVM
return 0;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_MD)
return targetm.expand_builtin (exp, target, subtarget, mode, ignore);
@@ -9339,9 +9339,9 @@
of tree_codes. If the last specifier is a 0, that represents an
ellipses, otherwise the last specifier must be a VOID_TYPE. */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
int /* export this for LLVM to use*/
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
validate_arglist (tree arglist, ...)
{
enum tree_code code;
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/c-common.c (original)
+++ llvm-gcc-4-2/trunk/gcc/c-common.c Fri Jul 13 03:39:34 2007
@@ -622,11 +622,11 @@
bool *);
static tree handle_sentinel_attribute (tree *, tree, tree, int, bool *);
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
static tree handle_annotate_attribute (tree*, tree, tree, int, bool *);
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
static void check_function_nonnull (tree, tree);
static void check_nonnull_arg (void *, tree, unsigned HOST_WIDE_INT);
@@ -729,12 +729,12 @@
handle_warn_unused_result_attribute },
{ "sentinel", 0, 1, false, true, true,
handle_sentinel_attribute },
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
{ "annotate", 0, -1, true, false, false,
handle_annotate_attribute },
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
{ NULL, 0, 0, false, false, false, NULL }
};
@@ -2489,7 +2489,7 @@
pointer_int_sum (enum tree_code resultcode, tree ptrop, tree intop)
{
tree size_exp, ret;
- /* APPLE LOCAL LLVM */
+ /* LLVM LOCAL */
bool size_set = 0;
/* The result is a pointer of the same type that is being added. */
@@ -2514,7 +2514,7 @@
pedwarn ("pointer to member function used in arithmetic");
size_exp = integer_one_node;
}
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
else {
size_set = 1;
size_exp = size_in_bytes (TREE_TYPE (result_type));
@@ -2548,7 +2548,7 @@
return folded;
}
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* We are manipulating pointer values, so we don't need to warn
about relying on undefined signed overflow. We disable the
@@ -2765,7 +2765,7 @@
&& DECL_EXTERNAL (inner))
break;
-/* APPLE LOCAL begin llvm */
+/* LLVM LOCAL begin */
#if ENABLE_LLVM
/* LLVM extends ARRAY_REF to allow pointers to be the base value. It is not
valid to assume ADDR of this is nonzero, because it could be derived from
@@ -2775,7 +2775,7 @@
!= ARRAY_TYPE)
break;
#endif
-/* APPLE LOCAL end llvm */
+/* LLVM LOCAL end */
if (TREE_SIDE_EFFECTS (inner))
return build2 (COMPOUND_EXPR, truthvalue_type_node,
@@ -6033,7 +6033,7 @@
return NULL_TREE;
}
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Handle "annotate" attribute */
static tree
@@ -6064,7 +6064,7 @@
return NULL_TREE;
}
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* Check for valid arguments being passed to a function. */
void
@@ -6922,9 +6922,9 @@
/* Default value of the constraint table. */
/* ??? This should be in defaults.h or a CW asm specific header. */
#ifndef TARGET_IASM_OP_CONSTRAINT
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#define TARGET_IASM_OP_CONSTRAINT
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#endif
/* Comparison function for bsearch to find an opcode/argument number
@@ -7004,9 +7004,9 @@
/* This table must be sorted. */
const struct iasm_op_constraint db[] = {
TARGET_IASM_OP_CONSTRAINT
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
{ "", 0, "" }
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
};
struct iasm_op_constraint key;
struct iasm_op_constraint *r;
@@ -7018,9 +7018,9 @@
{
size_t i;
once = 1;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
for (i=0; i < sizeof (db) / sizeof(db[0]) - 2; ++i)
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
gcc_assert (iasm_op_comp (&db[i+1], &db[i]) >= 0);
}
#endif
@@ -7030,9 +7030,9 @@
TARGET_IASM_REORDER_ARG(opcode, key.argnum, num_args, argnum);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
r = bsearch (&key, db, sizeof (db) / sizeof (db[0]) - 1, sizeof (db[0]), iasm_op_comp);
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
IASM_SYNTH_CONSTRAINTS(r, argnum, num_args, db);
@@ -7088,13 +7088,13 @@
tree *outputsp, tree *inputsp, tree *uses, unsigned num_args,
iasm_md_extra_info *e)
{
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
const char *s = NULL;
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
bool was_output = true;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
tree str = NULL, one;
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
tree var = e->dat[op_num].var;
unsigned argnum = e->dat[op_num].argnum;
/* must_be_reg is true, iff we know the operand must be a register. */
Modified: llvm-gcc-4-2/trunk/gcc/c-cppbuiltin.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/c-cppbuiltin.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/c-cppbuiltin.c (original)
+++ llvm-gcc-4-2/trunk/gcc/c-cppbuiltin.c Fri Jul 13 03:39:34 2007
@@ -370,7 +370,7 @@
gcc_assert (!*v || *v == ' ' || *v == '-');
- /* APPLE LOCAL LLVM no version number */
+ /* LLVM LOCAL no version number */
#ifndef LLVM_VERSION_INFO
/* APPLE LOCAL begin Apple version */
@@ -401,7 +401,7 @@
#endif
/* APPLE LOCAL end Apple version */
- /* APPLE LOCAL begin LLVM version number */
+ /* LLVM LOCAL begin version number */
#else
#ifdef CONFIG_DARWIN_H
/* This chunk of code defines __APPLE_CC__ from the version
@@ -445,7 +445,7 @@
}
#endif /*CONFIG_DARWIN_H*/
#endif /*LLVM_VERSION_INFO*/
- /* APPLE LOCAL end LLVM version number */
+ /* LLVM LOCAL end version number */
}
/* Define macros used by <stdint.h>. Currently only defines limits
@@ -475,11 +475,11 @@
define__GNUC__ ();
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
cpp_define (pfile, "__llvm__");
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* For stddef.h. They require macros defined in c-common.c. */
c_stddef_cpp_builtins ();
Modified: llvm-gcc-4-2/trunk/gcc/c-decl.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/c-decl.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/c-decl.c (original)
+++ llvm-gcc-4-2/trunk/gcc/c-decl.c Fri Jul 13 03:39:34 2007
@@ -61,7 +61,7 @@
#include "except.h"
#include "langhooks-def.h"
#include "pointer-set.h"
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
#include "llvm.h"
/* In grokdeclarator, distinguish syntactic contexts of declarators. */
@@ -2000,7 +2000,7 @@
/* If OLDDECL had its DECL_RTL instantiated, re-invoke make_decl_rtl
so that encode_section_info has a chance to look at the new decl
flags and attributes. */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
if (DECL_RTL_SET_P (olddecl)
&& (TREE_CODE (olddecl) == FUNCTION_DECL
@@ -7130,7 +7130,7 @@
tree_rest_of_compilation (fndecl);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
if (DECL_STATIC_CONSTRUCTOR (fndecl))
llvm_emit_ctor_dtor (fndecl, DEFAULT_INIT_PRIORITY, 1);
@@ -7138,7 +7138,7 @@
llvm_emit_ctor_dtor (fndecl, DEFAULT_INIT_PRIORITY, 0);
return;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (DECL_STATIC_CONSTRUCTOR (fndecl)
&& targetm.have_ctors_dtors)
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/c-incpath.c (original)
+++ llvm-gcc-4-2/trunk/gcc/c-incpath.c Fri Jul 13 03:39:34 2007
@@ -233,9 +233,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)
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
&& (unsigned) f_info.st_size >= sizeof(struct hmap_header_map))
- /* APPLE LOCAL end LLVM */
+ /* 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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/c-lex.c (original)
+++ llvm-gcc-4-2/trunk/gcc/c-lex.c Fri Jul 13 03:39:34 2007
@@ -766,7 +766,7 @@
return itk_none;
}
-/* APPLE LOCAL begin llvm hack for PR1521 */
+/* LLVM LOCAL begin hack for PR1521 */
#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. */
@@ -792,7 +792,7 @@
return num;
}
-/* APPLE LOCAL llvm end */
+/* LLVM LOCAL end */
/* Interpret TOKEN, an integer with FLAGS as classified by cpplib. */
static tree
@@ -804,7 +804,7 @@
cpp_options *options = cpp_get_options (parse_in);
integer = cpp_interpret_integer (parse_in, token, flags);
- /* APPLE LOCAL llvm hack for PR1521 */
+ /* LLVM LOCAL hack for PR1521 */
integer = my_cpp_num_sign_extend (integer, options->precision);
/* The type of a constant with a U suffix is straightforward. */
Modified: llvm-gcc-4-2/trunk/gcc/c-pch.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/c-pch.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/c-pch.c (original)
+++ llvm-gcc-4-2/trunk/gcc/c-pch.c Fri Jul 13 03:39:34 2007
@@ -34,7 +34,7 @@
#include "langhooks.h"
#include "hosthooks.h"
#include "target.h"
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#include "llvm.h"
/* This is a list of flag variables that must match exactly, and their
@@ -181,11 +181,11 @@
long written;
struct c_pch_header h;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
llvm_asm_file_end();
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
(*debug_hooks->handle_pch) (1);
cpp_write_pch_deps (parse_in, pch_outfile);
@@ -393,7 +393,7 @@
if (!flag_preprocess_only)
{
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
unsigned char *buf = xmalloc (h.asm_size);
if (fread (buf, h.asm_size, 1, f) != 1)
@@ -414,7 +414,7 @@
written += size;
}
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
free (buf);
}
else
Modified: llvm-gcc-4-2/trunk/gcc/c-ppoutput.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/c-ppoutput.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/c-ppoutput.c (original)
+++ llvm-gcc-4-2/trunk/gcc/c-ppoutput.c Fri Jul 13 03:39:34 2007
@@ -21,7 +21,7 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
#include "toplev.h"
#include "cpplib.h"
#include "../libcpp/internal.h"
@@ -455,10 +455,10 @@
{
c_common_read_pch (pfile, name, fd, orig_name);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
fprintf (print.outf, "#pragma GCC pch_preprocess ");
output_quoted_string (print.outf, name);
fprintf (print.outf, "\n");
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
print.src_line++;
}
Modified: llvm-gcc-4-2/trunk/gcc/c-typeck.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/c-typeck.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/c-typeck.c (original)
+++ llvm-gcc-4-2/trunk/gcc/c-typeck.c Fri Jul 13 03:39:34 2007
@@ -2072,7 +2072,7 @@
gcc_assert (TREE_CODE (TREE_TYPE (ar)) == POINTER_TYPE);
gcc_assert (TREE_CODE (TREE_TYPE (TREE_TYPE (ar))) != FUNCTION_TYPE);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Do not create explicit pointer arithmetic for pointer subscripts,
* instead, generate an array ref, even though the first argument is a
@@ -2086,7 +2086,7 @@
return build4 (ARRAY_REF, ty, ar, index, NULL_TREE, NULL_TREE);
}
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
return build_indirect_ref (build_binary_op (PLUS_EXPR, ar, index, 0),
"array indexing");
@@ -3183,7 +3183,7 @@
return TREE_OPERAND (arg, 0);
}
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
/* LLVM wants &x[y] to be kept as an &x[y] for better optimization. */
#ifndef ENABLE_LLVM
/* For &x[y], return x+y */
@@ -3199,7 +3199,7 @@
TREE_OPERAND (arg, 1), 1);
}
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* Anything not already handled and not a true memory reference
or a non-lvalue array is an error. */
@@ -3375,13 +3375,13 @@
case ARRAY_REF:
case REALPART_EXPR:
case IMAGPART_EXPR:
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
if (TREE_CODE (x) == ARRAY_REF &&
TREE_CODE (TREE_TYPE (TREE_OPERAND (x, 0))) != ARRAY_TYPE)
return true; /* Ignore pointer base of array ref extension. */
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
x = TREE_OPERAND (x, 0);
break;
@@ -7464,7 +7464,7 @@
case ADDR_EXPR:
inner = TREE_OPERAND (inner, 0);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
while (REFERENCE_CLASS_P (inner)
&& TREE_CODE (inner) != INDIRECT_REF) {
#ifdef ENABLE_LLVM
@@ -7475,7 +7475,7 @@
#endif
inner = TREE_OPERAND (inner, 0);
}
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (DECL_P (inner)
&& !DECL_EXTERNAL (inner)
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cgraph.c (original)
+++ llvm-gcc-4-2/trunk/gcc/cgraph.c Fri Jul 13 03:39:34 2007
@@ -261,13 +261,13 @@
historically been doing the wrong thing in assemble_alias by always
printing the leading underscore. Since we're not changing that, make
sure user_label_prefix follows the '*' before matching. */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
if (IDENTIFIER_POINTER (decl_asmname)[0] == 1)
#else
if (IDENTIFIER_POINTER (decl_asmname)[0] == '*')
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
{
const char *decl_str = IDENTIFIER_POINTER (decl_asmname) + 1;
size_t ulp_len = strlen (user_label_prefix);
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cgraphunit.c (original)
+++ llvm-gcc-4-2/trunk/gcc/cgraphunit.c Fri Jul 13 03:39:34 2007
@@ -166,7 +166,7 @@
#include "tree-gimple.h"
#include "tree-pass.h"
#include "output.h"
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
#include "llvm.h"
static void cgraph_expand_all_functions (void);
@@ -1793,12 +1793,12 @@
else
cgraph_finalize_function (decl, 0);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
llvm_emit_ctor_dtor (decl, priority, which == 'I');
return;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (targetm.have_ctors_dtors)
{
Modified: llvm-gcc-4-2/trunk/gcc/common.opt
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/common.opt?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/common.opt (original)
+++ llvm-gcc-4-2/trunk/gcc/common.opt Fri Jul 13 03:39:34 2007
@@ -214,7 +214,7 @@
Common Separate
-dumpbase <file> Set the file basename to be used for dumps
-; APPLE LOCAL begin LLVM
+; LLVM LOCAL begin
; Emit LLVM assembly to the .s file instead of native code.
emit-llvm
Common Report Var(emit_llvm)
@@ -224,7 +224,7 @@
emit-llvm-bc
Common Report Var(emit_llvm_bc)
Emit LLVM IR to the output file instead of native machine code.
-; APPLE LOCAL end LLVM
+; LLVM LOCAL end
; The version of the C++ ABI in use. The following values are allowed:
;
@@ -1312,11 +1312,11 @@
Common JoinedOrMissing Negative(gcoff)
Generate debug information in extended XCOFF format
-; APPLE LOCAL begin LLVM
+; LLVM LOCAL begin
mllvm
Common Separate Report
Specify options directly to the LLVM backend
-; APPLE LOCAL end LLVM
+; LLVM LOCAL end
o
Common Joined Separate
Modified: llvm-gcc-4-2/trunk/gcc/config.gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config.gcc?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config.gcc (original)
+++ llvm-gcc-4-2/trunk/gcc/config.gcc Fri Jul 13 03:39:34 2007
@@ -69,12 +69,12 @@
# defining header ${cpu_type}/${cpu_type.h}.
#
# tm_p_file Location of file with declarations for functions
-# APPLE LOCAL LLVM
+# LLVM LOCAL
# in $out_file & $out_cxx_file
#
# out_file The name of the machine description C support
# file, if different from "$cpu_type/$cpu_type.c".
-# APPLE LOCAL LLVM
+# LLVM LOCAL
# out_cxx_file The name of the machine description C++ support file.
#
# md_file The name of the machine-description file, if
@@ -154,7 +154,7 @@
# system normally uses GNU ld.
out_file=
-# APPLE LOCAL LLVM
+# LLVM LOCAL
out_cxx_file=
tmake_file=
extra_headers=
@@ -274,17 +274,17 @@
# APPLE LOCAL begin mainline
i[34567]86-*-*)
cpu_type=i386
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
out_cxx_file=i386/llvm-i386.cpp
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
pmmintrin.h tmmintrin.h"
;;
x86_64-*-*)
cpu_type=i386
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
out_cxx_file=i386/llvm-i386.cpp
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
pmmintrin.h tmmintrin.h"
need_64bit_hwint=yes
@@ -3097,7 +3097,7 @@
target_cpu_default2="\\\"$with_cpu\\\""
fi
out_file=rs6000/rs6000.c
- # APPLE LOCAL begin LLVM
+ # LLVM LOCAL begin
out_cxx_file=rs6000/llvm-rs6000.cpp
c_target_objs="${c_target_objs} rs6000-c.o"
cxx_target_objs="${cxx_target_objs} rs6000-c.o"
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/arm/arm.c (original)
+++ llvm-gcc-4-2/trunk/gcc/config/arm/arm.c Fri Jul 13 03:39:34 2007
@@ -4903,7 +4903,7 @@
}
}
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
/* Values which must be returned in the most-significant end of the return
register. */
@@ -4915,7 +4915,7 @@
&& (AGGREGATE_TYPE_P (valtype)
|| TREE_CODE (valtype) == COMPLEX_TYPE));
}
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* RTX cost for cores with a fast multiply unit (M variants). */
@@ -6235,7 +6235,7 @@
return "";
}
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
/* Return true if a type must be passed in memory. For AAPCS, small aggregates
(padded to the size of a word) should be passed in a register. */
@@ -6286,7 +6286,7 @@
/* Otherwise, use default padding. */
return !BYTES_BIG_ENDIAN;
}
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* Routines for use in generating RTL. */
@@ -13042,7 +13042,7 @@
fprintf (f, "}\n");
}
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
if (ARM_EABI_UNWIND_TABLES && push)
{
fprintf (f, "\t.save\t{");
@@ -13057,7 +13057,7 @@
}
fprintf (f, "}\n");
}
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
fprintf (f, "\t%s\t{", push ? "push" : "pop");
@@ -14111,10 +14111,10 @@
if (ARM_EABI_UNWIND_TABLES)
asm_fprintf (f, "\t.pad #16\n");
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
if (ARM_EABI_UNWIND_TABLES)
asm_fprintf (f, "\t.pad #16\n");
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
asm_fprintf
(f, "\tsub\t%r, %r, #16\t%@ Create stack backtrace structure\n",
@@ -15145,9 +15145,9 @@
static bool
arm_align_anon_bitfield (void)
{
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
return TARGET_AAPCS_BASED && arm_abi != ARM_ABI_AAPCS_LINUX;
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
}
@@ -15246,13 +15246,13 @@
}
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
static bool
arm_cxx_use_aeabi_atexit (void)
{
return TARGET_AAPCS_BASED;
}
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
void
arm_set_return_address (rtx source, rtx scratch)
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4-2/trunk/gcc/config/arm/arm.h Fri Jul 13 03:39:34 2007
@@ -519,11 +519,11 @@
#define PTRDIFF_TYPE (TARGET_AAPCS_BASED ? "int" : "long int")
#endif
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifndef PTRDIFF_TYPE
#define PTRDIFF_TYPE (TARGET_AAPCS_BASED ? "int" : "long int")
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* AAPCS requires that structure alignment is affected by bitfields. */
#ifndef PCC_BITFIELD_TYPE_MATTERS
@@ -882,9 +882,9 @@
#define DBX_REGISTER_NUMBER(REGNO) arm_dbx_register_number (REGNO)
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#define DBX_REGISTER_NUMBER(REGNO) arm_dbx_register_number (REGNO)
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* Value should be nonzero if functions must have frame pointers.
Zero means the frame pointer need not be set up (and parms may be accessed
@@ -1482,7 +1482,7 @@
#define PAD_VARARGS_DOWN \
((TARGET_AAPCS_BASED) ? 0 : BYTES_BIG_ENDIAN)
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#define FUNCTION_ARG_PADDING(MODE, TYPE) \
(arm_pad_arg_upward (MODE, TYPE) ? upward : downward)
@@ -1493,7 +1493,7 @@
* mimic the default. */
#define PAD_VARARGS_DOWN \
((TARGET_AAPCS_BASED) ? 0 : BYTES_BIG_ENDIAN)
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* Initialize a variable CUM of type CUMULATIVE_ARGS
for a call to a function whose data type is FNTYPE.
@@ -1918,7 +1918,7 @@
#define ARM_EABI_UNWIND_TABLES 0
#endif
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#define ARM_OUTPUT_FN_UNWIND(F, PROLOGUE) arm_output_fn_unwind (F, PROLOGUE)
#ifdef TARGET_UNWIND_INFO
@@ -1927,7 +1927,7 @@
#else
#define ARM_EABI_UNWIND_TABLES 0
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* The macros REG_OK_FOR..._P assume that the arg is a REG rtx
and check its validity for a certain class.
@@ -2630,7 +2630,7 @@
ARM_BUILTIN_MAX
};
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#define LLVM_TARGET_INTRINSIC_PREFIX "arm"
/* Turn -march=xx into a CPU type.
@@ -2685,6 +2685,6 @@
/* Doing struct copy by partial-word loads and stores is not a good idea on ARM. */
#define TARGET_LLVM_MIN_BYTES_COPY_BY_MEMCPY 4
-/* APPLE LOCAL end llvm */
+/* LLVM LOCAL end */
#endif /* ! GCC_ARM_H */
Modified: llvm-gcc-4-2/trunk/gcc/config/arm/lib1funcs.asm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/arm/lib1funcs.asm?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/arm/lib1funcs.asm (original)
+++ llvm-gcc-4-2/trunk/gcc/config/arm/lib1funcs.asm Fri Jul 13 03:39:34 2007
@@ -1306,7 +1306,7 @@
#include "ieee754-df.S"
#include "ieee754-sf.S"
#include "bpabi.S"
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#include "libunwind.S"
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#endif /* __symbian__ */
Modified: llvm-gcc-4-2/trunk/gcc/config/arm/t-bpabi
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/arm/t-bpabi?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/arm/t-bpabi (original)
+++ llvm-gcc-4-2/trunk/gcc/config/arm/t-bpabi Fri Jul 13 03:39:34 2007
@@ -1,8 +1,8 @@
# Add the bpabi.S functions.
-#APPLE LOCAL begin LLVM
+#LLVM LOCAL begin
LIB1ASMFUNCS += _aeabi_lcmp _aeabi_ulcmp _aeabi_ldivmod _aeabi_uldivmod \
_unwind
-#APPLE LOCAL end LLVM
+#LLVM LOCAL end
# Add the BPABI C functions.
LIB2FUNCS_EXTRA = $(srcdir)/config/arm/bpabi.c \
Modified: llvm-gcc-4-2/trunk/gcc/config/arm/t-symbian
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/arm/t-symbian?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/arm/t-symbian (original)
+++ llvm-gcc-4-2/trunk/gcc/config/arm/t-symbian Fri Jul 13 03:39:34 2007
@@ -17,12 +17,12 @@
LIB2ADDEH = $(srcdir)/unwind-c.c $(srcdir)/config/arm/pr-support.c
LIB2ADDEHDEP = $(UNWIND_H)
-#APPLE LOCAL begin LLVM
+#LLVM LOCAL begin
# Include the gcc personality routine
UNWIND_H = $(srcdir)/config/arm/unwind-arm.h
LIB2ADDEH = $(srcdir)/unwind-c.c
LIB2ADDEHDEP = $(UNWIND_H)
-#APPLE LOCAL end LLVM
+#LLVM LOCAL end
# Create a multilib for processors with VFP floating-point, and a
# multilib for those without -- using the soft-float ABI in both
Modified: llvm-gcc-4-2/trunk/gcc/config/darwin.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/darwin.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/darwin.c (original)
+++ llvm-gcc-4-2/trunk/gcc/config/darwin.c Fri Jul 13 03:39:34 2007
@@ -1464,7 +1464,7 @@
/* APPLE LOCAL end darwin_set_section_for_var_p */
}
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
const char *darwin_objc_llvm_implicit_target_global_var_section(tree decl) {
const char *name;
@@ -1540,7 +1540,7 @@
return 0;
}
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* This can be called with address expressions as "rtx".
They must go in "const". */
Modified: llvm-gcc-4-2/trunk/gcc/config/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/darwin.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4-2/trunk/gcc/config/darwin.h Fri Jul 13 03:39:34 2007
@@ -155,7 +155,7 @@
{ "-image_base", "-Zimage_base" }, \
{ "-init", "-Zinit" }, \
{ "-install_name", "-Zinstall_name" }, \
- /* APPLE LOCAL llvm */ \
+ /* LLVM LOCAL */ \
{ "-mllvm", "-Zmllvm" }, \
{ "-mkernel", "-mkernel -static -Wa,-static" }, \
{ "-multiply_defined_unused", "-Zmultiplydefinedunused" }, \
@@ -233,7 +233,7 @@
!strcmp (STR, "Zimage_base") ? 1 : \
!strcmp (STR, "Zinit") ? 1 : \
!strcmp (STR, "Zinstall_name") ? 1 : \
- /* APPLE LOCAL llvm */ \
+ /* LLVM LOCAL */ \
!strcmp (STR, "Zmllvm") ? 1 : \
!strcmp (STR, "Zmultiplydefinedunused") ? 1 : \
!strcmp (STR, "Zmultiply_defined") ? 1 : \
@@ -290,7 +290,7 @@
#define CC1PLUS_SPEC "-D__private_extern__=extern"
/* APPLE LOCAL end private extern */
-/* APPLE LOCAL begin llvm */
+/* LLVM LOCAL begin */
#ifdef HAVE_DSYMUTIL
#define DARWIN_DSYMUTIL_SPEC "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
%{.c|.cc|.C|.cpp|.c++|.CPP|.m|.mm: \
@@ -298,7 +298,7 @@
#else
#define DARWIN_DSYMUTIL_SPEC ""
#endif
-/* APPLE LOCAL end llvm */
+/* LLVM LOCAL end */
/* This is mostly a clone of the standard LINK_COMMAND_SPEC, plus
precomp, libtool, and fat build additions. Also we
don't specify a second %G after %L because libSystem is
@@ -321,9 +321,9 @@
%{fnested-functions: -allow_stack_execute} \
%{!nostdlib:%{!nodefaultlibs:%(link_ssp) %G %L}} \
"/* APPLE LOCAL begin mainline 4.3 2006-10-31 4370146 */"\
-"/* APPLE LOCAL begin llvm */"\
+"/* LLVM LOCAL begin */"\
%{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} %{F*} }}}}}}}} \n %(darwin_dsymutil) "
-/* APPLE LOCAL end llvm */
+/* LLVM LOCAL end */
/* APPLE LOCAL end mainline 4.3 2006-10-31 4370146 */
/* APPLE LOCAL end mainline */
@@ -485,7 +485,7 @@
#define DARWIN_EXTRA_SPECS \
{ "darwin_crt1", DARWIN_CRT1_SPEC }, \
{ "darwin_dylib1", DARWIN_DYLIB1_SPEC }, \
- /* APPLE LOCAL LLVM */ \
+ /* LLVM LOCAL */ \
{ "darwin_dsymutil", DARWIN_DSYMUTIL_SPEC }, \
{ "darwin_minversion", DARWIN_MINVERSION_SPEC },
@@ -509,7 +509,7 @@
#define DBX_DEBUGGING_INFO 1
-/* APPLE LOCAL begin llvm */
+/* LLVM LOCAL begin */
/* Prefer DWARF only if appropriate dsymutil is available. */
#define DWARF2_DEBUGGING_INFO
#ifdef HAVE_DSYMUTIL
@@ -517,7 +517,7 @@
#else
#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
#endif
-/* APPLE LOCAL end llvm */
+/* LLVM LOCAL end */
/* APPLE LOCAL end mainline 4.3 2006-10-31 4370143 */
#define DEBUG_FRAME_SECTION "__DWARF,__debug_frame,regular,debug"
@@ -583,7 +583,7 @@
fputc ('\n', FILE); \
} while (0)
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
/* weak_import, a Darwin special, does not make function definitions weak. */
#define TARGET_ADJUST_LLVM_LINKAGE(FN, DECL) \
do { \
@@ -598,7 +598,7 @@
(FN)->setLinkage(Function::ExternalLinkage); \
} \
} while (0)
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* Darwin has the pthread routines in libSystem, which every program
links to, so there's no need for weak-ness for that. */
@@ -1217,7 +1217,7 @@
/* APPLE LOCAL end iframework for 4.3 4094959 */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* LLVM_IMPLICIT_TARGET_GLOBAL_VAR_SECTION - Given a VAR_DECL for a global
* variable, return a "const char*" that indicates which section to put it in if
@@ -1242,7 +1242,7 @@
else if (!MACHO_DYNAMIC_NO_PIC_P) \
argvec.push_back ("--relocation-model=static")
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* APPLE LOCAL begin isysroot 5083137 */
/* Allow -sysroot to select a target system SDK. */
Modified: llvm-gcc-4-2/trunk/gcc/config/freebsd-spec.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/freebsd-spec.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/freebsd-spec.h (original)
+++ llvm-gcc-4-2/trunk/gcc/config/freebsd-spec.h Fri Jul 13 03:39:34 2007
@@ -48,7 +48,7 @@
|| !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") \
|| !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker"))
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
#define FBSD_TARGET_OS_CPP_BUILTINS() \
do \
@@ -87,7 +87,7 @@
} \
while (0)
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* Define the default FreeBSD-specific per-CPU hook code. */
#define FBSD_TARGET_CPU_CPP_BUILTINS() do {} while (0)
Modified: llvm-gcc-4-2/trunk/gcc/config/i386/cygming.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/i386/cygming.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/i386/cygming.h (original)
+++ llvm-gcc-4-2/trunk/gcc/config/i386/cygming.h Fri Jul 13 03:39:34 2007
@@ -414,7 +414,7 @@
# undef FILE
#endif
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* LLVM specific stuff for supporting dllimport & dllexport linkage output */
@@ -431,7 +431,7 @@
/* Add general target specific stuff */
#include "llvm-i386-target.h"
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#endif
Modified: llvm-gcc-4-2/trunk/gcc/config/i386/darwin-libgcc.10.4.ver
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/i386/darwin-libgcc.10.4.ver?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/i386/darwin-libgcc.10.4.ver (original)
+++ llvm-gcc-4-2/trunk/gcc/config/i386/darwin-libgcc.10.4.ver Fri Jul 13 03:39:34 2007
@@ -33,7 +33,7 @@
___divdc3
___divdi3
___divsc3
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___divxc3
___enable_execute_stack
___ffsdi2
@@ -43,15 +43,15 @@
___fixunsdfsi
___fixunssfdi
___fixunssfsi
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___fixunsxfdi
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___fixunsxfsi
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___fixxfdi
___floatdidf
___floatdisf
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___floatdixf
___gcc_personality_v0
___lshrdi3
@@ -61,7 +61,7 @@
___mulsc3
___mulvdi3
___mulvsi3
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___mulxc3
___negdi2
___negvdi2
@@ -72,7 +72,7 @@
___popcountsi2
___powidf2
___powisf2
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___powixf2
___register_frame
___register_frame_info
Modified: llvm-gcc-4-2/trunk/gcc/config/i386/darwin-libgcc.10.5.ver
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/i386/darwin-libgcc.10.5.ver?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/i386/darwin-libgcc.10.5.ver (original)
+++ llvm-gcc-4-2/trunk/gcc/config/i386/darwin-libgcc.10.5.ver Fri Jul 13 03:39:34 2007
@@ -34,7 +34,7 @@
___divdc3
___divdi3
___divsc3
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___divxc3
___enable_execute_stack
___ffsdi2
@@ -61,7 +61,7 @@
___mulsc3
___mulvdi3
___mulvsi3
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___mulxc3
___negdi2
___negvdi2
@@ -72,7 +72,7 @@
___popcountsi2
___powidf2
___powisf2
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___powixf2
___register_frame
___register_frame_info
Modified: llvm-gcc-4-2/trunk/gcc/config/i386/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/i386/darwin.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/i386/darwin.h (original)
+++ llvm-gcc-4-2/trunk/gcc/config/i386/darwin.h Fri Jul 13 03:39:34 2007
@@ -379,11 +379,11 @@
used in Mach-O. */
#undef MACHO_SYMBOL_FLAG_VARIABLE
#define MACHO_SYMBOL_FLAG_VARIABLE ((SYMBOL_FLAG_MACH_DEP) << 3)
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Add general target specific stuff */
#include "llvm-i386-target.h"
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#endif
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/i386/i386.c (original)
+++ llvm-gcc-4-2/trunk/gcc/config/i386/i386.c Fri Jul 13 03:39:34 2007
@@ -15041,9 +15041,9 @@
#endif
}
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
/* Move ix86_builtins to i386.h */
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#define def_builtin(MASK, NAME, TYPE, CODE) \
do { \
if ((MASK) & target_flags \
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/i386/i386.h (original)
+++ llvm-gcc-4-2/trunk/gcc/config/i386/i386.h Fri Jul 13 03:39:34 2007
@@ -506,9 +506,9 @@
builtin_define ("__core2__"); \
} \
/* APPLE LOCAL end mainline */ \
- /* APPLE LOCAL begin LLVM PR879 workaround */ \
+ /* LLVM LOCAL begin PR879 workaround */ \
builtin_define("__NO_MATH_INLINES"); \
- /* APPLE LOCAL end LLVM PR879 workaround */ \
+ /* LLVM LOCAL end PR879 workaround */ \
} \
while (0)
@@ -565,13 +565,13 @@
/* target machine storage layout */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#if defined(ENABLE_LLVM) || defined(__llvm__)
#define LONG_DOUBLE_TYPE_SIZE 64
#else
#define LONG_DOUBLE_TYPE_SIZE 80
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* Set the value of FLT_EVAL_METHOD in float.h. When using only the
FPU, assume that the fpcw is set to extended precision; when using
@@ -3216,7 +3216,7 @@
#define SYMBOL_REF_FAR_ADDR_P(X) \
((SYMBOL_REF_FLAGS (X) & SYMBOL_FLAG_FAR_ADDR) != 0)
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
/* Codes for all the SSE/MMX builtins. */
enum ix86_builtins
@@ -3737,7 +3737,7 @@
#define LLVM_TARGET_INTRINSIC_LOWER(EXP, BUILTIN_CODE, DESTLOC, RESULT, \
DESTTY, OPS) \
TargetIntrinsicLower(EXP, BUILTIN_CODE, DESTLOC, RESULT, DESTTY, OPS);
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/*
Local variables:
Modified: llvm-gcc-4-2/trunk/gcc/config/i386/linux.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/i386/linux.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/i386/linux.h (original)
+++ llvm-gcc-4-2/trunk/gcc/config/i386/linux.h Fri Jul 13 03:39:34 2007
@@ -192,11 +192,11 @@
/* i386 glibc provides __stack_chk_guard in %gs:0x14. */
#define TARGET_THREAD_SSP_OFFSET 0x14
#endif
-+ /* APPLE LOCAL begin LLVM */
++ /* LLVM LOCAL begin */
+ #ifdef ENABLE_LLVM
+
+ /* Add general target specific stuff */
+ #include "llvm-i386-target.h"
+
+ #endif
-+ /* APPLE LOCAL end LLVM */
++ /* LLVM LOCAL end */
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=39798&r1=39797&r2=39798&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 Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* Some target-specific hooks for gcc->llvm conversion
Copyright (C) 2007 Free Software Foundation, Inc.
Contributed by Anton Korobeynikov (asl at math.spbu.ru)
@@ -60,5 +60,5 @@
} \
}
-/* APPLE LOCAL end LLVM (ENTIRE FILE!) */
+/* 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=39798&r1=39797&r2=39798&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 Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* High-level LLVM backend interface
Copyright (C) 2005 Free Software Foundation, Inc.
Contributed by Evan Cheng (evan.cheng at apple.com)
Modified: llvm-gcc-4-2/trunk/gcc/config/ia64/ia64.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/ia64/ia64.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/ia64/ia64.h (original)
+++ llvm-gcc-4-2/trunk/gcc/config/ia64/ia64.h Fri Jul 13 03:39:34 2007
@@ -2007,9 +2007,9 @@
#define TARGET_UNWIND_TABLES_DEFAULT true
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#define TARGET_UNWIND_TABLES_DEFAULT true
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#define EH_RETURN_DATA_REGNO(N) ((N) < 4 ? (N) + 15 : INVALID_REGNUM)
Modified: llvm-gcc-4-2/trunk/gcc/config/linux.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/linux.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/linux.h (original)
+++ llvm-gcc-4-2/trunk/gcc/config/linux.h Fri Jul 13 03:39:34 2007
@@ -126,7 +126,7 @@
is present in the runtime library. */
#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Yes, we're supporting PIC codegen for linux targets! */
@@ -137,5 +137,5 @@
argvec.push_back ("--relocation-model=static");
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#define TARGET_POSIX_IO
Modified: llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-ldouble.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-ldouble.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-ldouble.c (original)
+++ llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-ldouble.c Fri Jul 13 03:39:34 2007
@@ -165,11 +165,11 @@
/* Use fused multiply-add to get low part of a * c. */
#ifndef _SOFT_FLOAT
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifndef __llvm__ /* FIXME: no long double support! */
asm ("fmsub %0,%1,%2,%3" : "=f"(tau) : "f"(a), "f"(c), "f"(t));
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#else
tau = fmsub (a, c, t);
#endif
@@ -206,11 +206,11 @@
/* Use fused multiply-add to get low part of c * t. */
#ifndef _SOFT_FLOAT
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifndef __llvm__ /* FIXME: no long double support! */
asm ("fmsub %0,%1,%2,%3" : "=f"(sigma) : "f"(c), "f"(t), "f"(s));
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#else
sigma = fmsub (c, t, s);
#endif
Modified: llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-libgcc.10.4.ver
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-libgcc.10.4.ver?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-libgcc.10.4.ver (original)
+++ llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-libgcc.10.4.ver Fri Jul 13 03:39:34 2007
@@ -35,17 +35,17 @@
___ffsdi2
___fixdfdi
___fixsfdi
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___fixtfdi
___fixunsdfdi
___fixunsdfsi
___fixunssfdi
___fixunssfsi
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___fixunstfdi
___floatdidf
___floatdisf
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___floatditf
___gcc_personality_v0
___gcc_qadd
Modified: llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-libgcc.10.5.ver
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-libgcc.10.5.ver?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-libgcc.10.5.ver (original)
+++ llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin-libgcc.10.5.ver Fri Jul 13 03:39:34 2007
@@ -34,23 +34,23 @@
___divdc3
___divdi3
___divsc3
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___divtc3
___enable_execute_stack
___ffsdi2
___fixdfdi
___fixsfdi
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___fixtfdi
___fixunsdfdi
___fixunsdfsi
___fixunssfdi
___fixunssfsi
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___fixunstfdi
___floatdidf
___floatdisf
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___floatditf
___floatundidf
___floatundisf
@@ -65,7 +65,7 @@
___muldc3
___muldi3
___mulsc3
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___multc3
___mulvdi3
___mulvsi3
@@ -78,7 +78,7 @@
___popcountsi2
___powidf2
___powisf2
-# APPLE LOCAL LLVM FIXME!
+# LLVM LOCAL FIXME!
#___powitf2
___register_frame
___register_frame_info
Modified: llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin.h (original)
+++ llvm-gcc-4-2/trunk/gcc/config/rs6000/darwin.h Fri Jul 13 03:39:34 2007
@@ -95,14 +95,14 @@
consistency; arithmetic will work even if libc and libm support is
not available. */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
#define RS6000_DEFAULT_LONG_DOUBLE_SIZE 128
#else
/* FIXME: no long double support yet! */
#define RS6000_DEFAULT_LONG_DOUBLE_SIZE 64
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* We want -fPIC by default, unless we're using -static to compile for
Modified: llvm-gcc-4-2/trunk/gcc/config/rs6000/llvm-rs6000.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/rs6000/llvm-rs6000.cpp?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/rs6000/llvm-rs6000.cpp (original)
+++ llvm-gcc-4-2/trunk/gcc/config/rs6000/llvm-rs6000.cpp Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* High-level LLVM backend interface
Copyright (C) 2007 Free Software Foundation, Inc.
Contributed by Jim Laskey (jlaskey at apple.com)
@@ -331,5 +331,5 @@
return false;
}
-/* APPLE LOCAL end LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4-2/trunk/gcc/config/rs6000/rs6000.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/rs6000/rs6000.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/rs6000/rs6000.c (original)
+++ llvm-gcc-4-2/trunk/gcc/config/rs6000/rs6000.c Fri Jul 13 03:39:34 2007
@@ -52,11 +52,11 @@
#include "langhooks.h"
#include "reload.h"
#include "cfglayout.h"
-/* APPLE LOCAL begin LLVM - Don't link in scheduler. */
+/* LLVM LOCAL begin - Don't link in scheduler. */
#ifndef ENABLE_LLVM
#include "sched-int.h"
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#include "tree-gimple.h"
/* APPLE LOCAL 3893112 */
#include "params.h"
@@ -151,9 +151,9 @@
/* Target cpu type */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
const char *rs6000_cpu_target = "ppc";
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
enum processor_type rs6000_cpu;
struct rs6000_cpu_select rs6000_select[3] =
@@ -676,10 +676,10 @@
static bool rs6000_reverse_bitfields_p (tree);
#endif
/* APPLE LOCAL end pragma reverse_bitfield */
-/* APPLE LOCAL LLVM - Disable scheduler. */
+/* LLVM LOCAL - Disable scheduler. */
#ifndef ENABLE_LLVM
static int rs6000_variable_issue (FILE *, int, rtx, int);
-/* APPLE LOCAL LLVM - Disable scheduler. */
+/* LLVM LOCAL - Disable scheduler. */
#endif
static bool rs6000_rtx_costs (rtx, int, int, int *);
static int rs6000_adjust_cost (rtx, rtx, rtx, int);
@@ -687,7 +687,7 @@
static int is_dispatch_slot_restricted (rtx);
static bool is_cracked_insn (rtx);
static bool is_branch_slot_insn (rtx);
-/* APPLE LOCAL LLVM - Disable scheduler. */
+/* LLVM LOCAL - Disable scheduler. */
#ifndef ENABLE_LLVM
static int rs6000_adjust_priority (rtx, int);
static int rs6000_issue_rate (void);
@@ -701,7 +701,7 @@
static void rs6000_sched_finish (FILE *, int);
static int rs6000_use_sched_lookahead (void);
-/* APPLE LOCAL LLVM - Disable scheduler. */
+/* LLVM LOCAL - Disable scheduler. */
#endif
static tree rs6000_builtin_mask_for_load (void);
@@ -952,7 +952,7 @@
#undef TARGET_ASM_FUNCTION_EPILOGUE
#define TARGET_ASM_FUNCTION_EPILOGUE rs6000_output_function_epilogue
-/* APPLE LOCAL LLVM - Disable scheduler. */
+/* LLVM LOCAL - Disable scheduler. */
#ifndef ENABLE_LLVM
#undef TARGET_SCHED_VARIABLE_ISSUE
#define TARGET_SCHED_VARIABLE_ISSUE rs6000_variable_issue
@@ -969,7 +969,7 @@
#define TARGET_SCHED_FINISH rs6000_sched_finish
#undef TARGET_SCHED_FIRST_CYCLE_MULTIPASS_DFA_LOOKAHEAD
#define TARGET_SCHED_FIRST_CYCLE_MULTIPASS_DFA_LOOKAHEAD rs6000_use_sched_lookahead
-/* APPLE LOCAL LLVM - Disable scheduler. */
+/* LLVM LOCAL - Disable scheduler. */
#endif
#undef TARGET_VECTORIZE_BUILTIN_MASK_FOR_LOAD
@@ -1402,9 +1402,9 @@
rs6000_select[0].string = default_cpu;
rs6000_cpu = TARGET_POWERPC64 ? PROCESSOR_DEFAULT64 : PROCESSOR_DEFAULT;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
rs6000_cpu_target = TARGET_POWERPC64 ? "ppc64" : "ppc";
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* APPLE LOCAL begin -fast */
if (flag_fast || flag_fastf || flag_fastcp)
@@ -1438,9 +1438,9 @@
mcpu_cpu = processor_target_table[j].processor;
/* APPLE LOCAL end -fast */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
rs6000_cpu_target = processor_target_table[j].name;
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
}
break;
}
@@ -9076,7 +9076,7 @@
unsigned_V8HI_type_node = build_vector_type (unsigned_intHI_type_node, 8);
unsigned_V4SI_type_node = build_vector_type (unsigned_intSI_type_node, 4);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* LLVM doesn't initialize the RTL backend, so build_vector_type will assign
all of these types BLKmode. This interferes with rs6000.c-specific
@@ -9090,7 +9090,7 @@
TYPE_MODE (unsigned_V8HI_type_node) = V8HImode;
TYPE_MODE (unsigned_V16QI_type_node) = V16QImode;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
opaque_V2SF_type_node = build_opaque_vector_type (float_type_node, 2);
opaque_V2SI_type_node = build_opaque_vector_type (intSI_type_node, 2);
@@ -18761,7 +18761,7 @@
break;
}
}
-/* APPLE LOCAL LLVM - Disable scheduler. */
+/* LLVM LOCAL - Disable scheduler. */
#ifndef ENABLE_LLVM
@@ -19676,7 +19676,7 @@
}
}
-/* APPLE LOCAL LLVM - Disable scheduler. */
+/* LLVM LOCAL - Disable scheduler. */
#endif ENABLE_LLVM
/* Length in units of the trampoline for entering a nested function. */
Modified: llvm-gcc-4-2/trunk/gcc/config/rs6000/rs6000.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/rs6000/rs6000.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/rs6000/rs6000.h (original)
+++ llvm-gcc-4-2/trunk/gcc/config/rs6000/rs6000.h Fri Jul 13 03:39:34 2007
@@ -215,9 +215,9 @@
PROCESSOR_POWER5
};
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
extern const char *rs6000_cpu_target;
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
extern enum processor_type rs6000_cpu;
@@ -3419,7 +3419,7 @@
/* APPLE LOCAL end CW asm blocks */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#define LLVM_TARGET_INTRINSIC_PREFIX "ppc"
/* Turn -march=xx into a CPU type.
@@ -3455,7 +3455,7 @@
DESTTY, OPS) \
TargetIntrinsicLower(EXP, BUILTIN_CODE, DESTLOC, RESULT, DESTTY, OPS);
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
enum rs6000_builtin_type_index
{
Modified: llvm-gcc-4-2/trunk/gcc/config/rs6000/t-darwin8
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/config/rs6000/t-darwin8?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/config/rs6000/t-darwin8 (original)
+++ llvm-gcc-4-2/trunk/gcc/config/rs6000/t-darwin8 Fri Jul 13 03:39:34 2007
@@ -1,7 +1,7 @@
# 64-bit libraries can only be built in Darwin 8.x or later.
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
# FIXME: how do I only disable this for llvm?
# MULTILIB_OPTIONS = m64
# MULTILIB_DIRNAMES = ppc64
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
Modified: llvm-gcc-4-2/trunk/gcc/configure
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/configure?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/configure (original)
+++ llvm-gcc-4-2/trunk/gcc/configure Fri Jul 13 03:39:34 2007
@@ -6540,7 +6540,7 @@
IFS="$ac_save_IFS"
nocommon_flag=""
-# APPLE LOCAL llvm
+# LLVM LOCAL
# Expose a flag in the makefile so we can tell when ENABLE_CHECKING is set.
checkingenabled_flag=""
if test x$ac_checking != x ; then
@@ -6550,10 +6550,10 @@
_ACEOF
nocommon_flag=-fno-common
- # APPLE LOCAL llvm
+ # LLVM LOCAL
checkingenabled_flag=CHECKING_ENABLED=1
fi
-# APPLE LOCAL llvm
+# LLVM LOCAL
if test x$ac_assert_checking != x ; then
@@ -7200,7 +7200,7 @@
fi;
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
# See if dsymutil has been installed and is modern enough
# that we can use DWARF.
@@ -7384,7 +7384,7 @@
LLVMBASEPATH=""
fi;
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# Sanity check enable_languages in case someone does not run the toplevel
# configure # script.
@@ -12565,7 +12565,7 @@
# Say what files are being used for the output code and MD file.
echo "Using \`$srcdir/config/$out_file' for machine-specific logic."
-# APPLE LOCAL llvm
+# LLVM LOCAL
echo "Using \`$srcdir/config/$out_cxx_file' for machine-specific C++ logic."
echo "Using \`$srcdir/config/$md_file' as machine description file."
@@ -13412,7 +13412,7 @@
out_object_file=`basename $out_file .c`.o
-# APPLE LOCAL LLVM
+# LLVM LOCAL
out_cxx_object_file=`basename $out_cxx_file .cpp`.o
tm_file_list="options.h"
@@ -16963,10 +16963,10 @@
-# APPLE LOCAL llvm
+# LLVM LOCAL
-# APPLE LOCAL llvm
+# LLVM LOCAL
Modified: llvm-gcc-4-2/trunk/gcc/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/configure.ac?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/configure.ac (original)
+++ llvm-gcc-4-2/trunk/gcc/configure.ac Fri Jul 13 03:39:34 2007
@@ -509,7 +509,7 @@
IFS="$ac_save_IFS"
nocommon_flag=""
-# APPLE LOCAL llvm
+# LLVM LOCAL
# Expose a flag in the makefile so we can tell when ENABLE_CHECKING is set.
checkingenabled_flag=""
if test x$ac_checking != x ; then
@@ -517,10 +517,10 @@
[Define if you want more run-time sanity checks. This one gets a grab
bag of miscellaneous but relatively cheap checks.])
nocommon_flag=-fno-common
- # APPLE LOCAL llvm
+ # LLVM LOCAL
checkingenabled_flag=CHECKING_ENABLED=1
fi
-# APPLE LOCAL llvm
+# LLVM LOCAL
AC_SUBST(checkingenabled_flag)
AC_SUBST(nocommon_flag)
if test x$ac_assert_checking != x ; then
@@ -814,7 +814,7 @@
[onestep=""])
AC_SUBST(onestep)
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
# See if dsymutil has been installed and is modern enough
# that we can use DWARF.
gcc_AC_CHECK_PROG_VER(DSYMUTIL, dsymutil, --version,
@@ -865,7 +865,7 @@
],
[LLVMBASEPATH=""])
AC_SUBST(LLVMBASEPATH)
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# Sanity check enable_languages in case someone does not run the toplevel
# configure # script.
@@ -1333,7 +1333,7 @@
# Say what files are being used for the output code and MD file.
echo "Using \`$srcdir/config/$out_file' for machine-specific logic."
-# APPLE LOCAL llvm
+# LLVM LOCAL
echo "Using \`$srcdir/config/$out_cxx_file' for machine-specific C++ logic."
echo "Using \`$srcdir/config/$md_file' as machine description file."
@@ -1709,7 +1709,7 @@
AC_SUBST(host_cc_for_libada)
out_object_file=`basename $out_file .c`.o
-# APPLE LOCAL LLVM
+# LLVM LOCAL
out_cxx_object_file=`basename $out_cxx_file .cpp`.o
tm_file_list="options.h"
@@ -3718,10 +3718,10 @@
AC_SUBST(md_file)
AC_SUBST(objc_boehm_gc)
AC_SUBST(out_file)
-# APPLE LOCAL llvm
+# LLVM LOCAL
AC_SUBST(out_cxx_file)
AC_SUBST(out_object_file)
-# APPLE LOCAL llvm
+# LLVM LOCAL
AC_SUBST(out_cxx_object_file)
AC_SUBST(stage_prefix_set_by_configure)
AC_SUBST(quoted_stage_prefix_set_by_configure)
Modified: llvm-gcc-4-2/trunk/gcc/configure.merged
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/configure.merged?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/configure.merged (original)
+++ llvm-gcc-4-2/trunk/gcc/configure.merged Fri Jul 13 03:39:34 2007
@@ -6540,7 +6540,7 @@
IFS="$ac_save_IFS"
nocommon_flag=""
-# APPLE LOCAL llvm
+# LLVM LOCAL
# Expose a flag in the makefile so we can tell when ENABLE_CHECKING is set.
checkingenabled_flag=""
if test x$ac_checking != x ; then
@@ -6550,10 +6550,10 @@
_ACEOF
nocommon_flag=-fno-common
- # APPLE LOCAL llvm
+ # LLVM LOCAL
checkingenabled_flag=CHECKING_ENABLED=1
fi
-# APPLE LOCAL llvm
+# LLVM LOCAL
if test x$ac_assert_checking != x ; then
@@ -7200,7 +7200,7 @@
fi;
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
# See if dsymutil has been installed and is modern enough
# that we can use DWARF.
# Extract the first word of "dsymutil", so it can be a program name with args.
@@ -7380,7 +7380,7 @@
LLVMBASEPATH=""
fi;
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# Sanity check enable_languages in case someone does not run the toplevel
# configure # script.
@@ -12563,7 +12563,7 @@
# Say what files are being used for the output code and MD file.
echo "Using \`$srcdir/config/$out_file' for machine-specific logic."
-# APPLE LOCAL llvm
+# LLVM LOCAL
echo "Using \`$srcdir/config/$out_cxx_file' for machine-specific C++ logic."
echo "Using \`$srcdir/config/$md_file' as machine description file."
@@ -13410,7 +13410,7 @@
out_object_file=`basename $out_file .c`.o
-# APPLE LOCAL LLVM
+# LLVM LOCAL
out_cxx_object_file=`basename $out_cxx_file .cpp`.o
tm_file_list="options.h"
@@ -16919,10 +16919,10 @@
-# APPLE LOCAL llvm
+# LLVM LOCAL
-# APPLE LOCAL llvm
+# LLVM LOCAL
Modified: llvm-gcc-4-2/trunk/gcc/cp/Make-lang.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/cp/Make-lang.in?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cp/Make-lang.in (original)
+++ llvm-gcc-4-2/trunk/gcc/cp/Make-lang.in Fri Jul 13 03:39:34 2007
@@ -62,7 +62,7 @@
# Create the compiler driver for g++.
GXX_OBJS = $(GCC_OBJS) g++spec.o intl.o prefix.o version.o
g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBDEPS)
- # APPLE LOCAL LLVM
+ # LLVM LOCAL
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBS)
@@ -102,7 +102,7 @@
cp-warn = $(STRICT_WARN) $(CXX_COMPAT_WARN)
# APPLE LOCAL begin order files --ilr
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
cc1plus-dummy$(exeext): $(CXX_OBJS) dummy-checksum.o $(BACKEND) $(LIBDEPS)
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(CXX_OBJS) dummy-checksum.o $(BACKEND) $(LIBS) \
@@ -114,12 +114,12 @@
cc1plus-checksum.o : cc1plus-checksum.c
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
cc1plus$(exeext): $(CXX_OBJS) cc1plus-checksum.o $(BACKEND) $(LIBDEPS)
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(CXX_OBJS) cc1plus-checksum.o $(BACKEND) $(LIBS) \
$(CC1PLUS_ORDER_FLAGS)
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# APPLE LOCAL end order files --ilr
# APPLE LOCAL 4133801
cp/parser.o: debug.h
Modified: llvm-gcc-4-2/trunk/gcc/cp/class.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/cp/class.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cp/class.c (original)
+++ llvm-gcc-4-2/trunk/gcc/cp/class.c Fri Jul 13 03:39:34 2007
@@ -3879,13 +3879,13 @@
}
/* Create the RTL for this function. */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
SET_DECL_RTL (clone, NULL_RTX);
#else
SET_DECL_LLVM (clone, 0);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
rest_of_decl_compilation (clone, /*top_level=*/1, at_eof);
/* Make it easy to find the CLONE given the FN. */
Modified: llvm-gcc-4-2/trunk/gcc/cp/decl.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/cp/decl.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cp/decl.c (original)
+++ llvm-gcc-4-2/trunk/gcc/cp/decl.c Fri Jul 13 03:39:34 2007
@@ -2079,7 +2079,7 @@
/* If OLDDECL had its DECL_RTL instantiated, re-invoke make_decl_rtl
so that encode_section_info has a chance to look at the new decl
flags and attributes. */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
if (DECL_RTL_SET_P (olddecl)
&& (TREE_CODE (olddecl) == FUNCTION_DECL
Modified: llvm-gcc-4-2/trunk/gcc/cp/decl2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/cp/decl2.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cp/decl2.c (original)
+++ llvm-gcc-4-2/trunk/gcc/cp/decl2.c Fri Jul 13 03:39:34 2007
@@ -51,7 +51,7 @@
#include "c-pragma.h"
#include "tree-dump.h"
#include "intl.h"
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
#include "llvm.h"
extern cpp_reader *parse_in;
@@ -2396,12 +2396,12 @@
if (flag_syntax_only)
return;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
llvm_emit_ctor_dtor (fn, initp, method_type == 'I');
return;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (targetm.have_ctors_dtors)
{
Modified: llvm-gcc-4-2/trunk/gcc/cp/lang-specs.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/cp/lang-specs.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cp/lang-specs.h (original)
+++ llvm-gcc-4-2/trunk/gcc/cp/lang-specs.h Fri Jul 13 03:39:34 2007
@@ -55,13 +55,13 @@
%(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
%{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
- "/* APPLE LOCAL LLVM */"\
+ "/* LLVM LOCAL */"\
%(llvm_options) %(cc1_options) %2 %{+e1*}\
%{!fsyntax-only:%(invoke_as)}}}}",
CPLUSPLUS_CPP_SPEC, 0, 0},
{".ii", "@c++-cpp-output", 0, 0, 0},
{"@c++-cpp-output",
"%{!M:%{!MM:%{!E:\
- "/* APPLE LOCAL LLVM */"\
+ "/* LLVM LOCAL */"\
cc1plus -fpreprocessed %i %(llvm_options) %(cc1_options) %2 %{+e*}\
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
Modified: llvm-gcc-4-2/trunk/gcc/cp/method.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/cp/method.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cp/method.c (original)
+++ llvm-gcc-4-2/trunk/gcc/cp/method.c Fri Jul 13 03:39:34 2007
@@ -354,14 +354,14 @@
if (!emit_p)
return;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
/* PR843 */
#ifndef ENABLE_LLVM
if (TARGET_USE_LOCAL_THUNK_ALIAS_P (function))
#else
if (0 && TARGET_USE_LOCAL_THUNK_ALIAS_P (function))
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
alias = make_alias_for_thunk (function);
else
alias = function;
@@ -401,12 +401,12 @@
push_to_top_level ();
if (TARGET_USE_LOCAL_THUNK_ALIAS_P (function)
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
/* PR1085 */
#ifdef ENABLE_LLVM
&& 0
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
&& targetm.have_named_sections)
{
resolve_unique_section (function, 0, flag_function_sections);
@@ -428,13 +428,13 @@
tree x = copy_node (a);
TREE_CHAIN (x) = t;
DECL_CONTEXT (x) = thunk_fndecl;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
SET_DECL_RTL (x, NULL_RTX);
#else
SET_DECL_LLVM (x, 0);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
DECL_HAS_VALUE_EXPR_P (x) = 0;
t = x;
}
@@ -442,11 +442,11 @@
DECL_ARGUMENTS (thunk_fndecl) = a;
if (this_adjusting
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
&& 0 /* FIXME: Always use a thunk function */
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
&& targetm.asm_out.can_output_mi_thunk (thunk_fndecl, fixed_offset,
virtual_value, alias))
{
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cp/parser.c (original)
+++ llvm-gcc-4-2/trunk/gcc/cp/parser.c Fri Jul 13 03:39:34 2007
@@ -21590,12 +21590,12 @@
/* Bad parse errors. Just forget about it. */
if (! global_bindings_p () || current_class_type || decl_namespace_list)
return;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
if (pch_file) {
c_common_write_pch ();
return;
}
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* APPLE LOCAL end radar 4874613 */
}
Modified: llvm-gcc-4-2/trunk/gcc/cp/pt.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/cp/pt.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cp/pt.c (original)
+++ llvm-gcc-4-2/trunk/gcc/cp/pt.c Fri Jul 13 03:39:34 2007
@@ -5365,13 +5365,13 @@
later if we need it. */
if (TREE_CODE (new_friend) != TEMPLATE_DECL)
{
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
SET_DECL_RTL (new_friend, NULL_RTX);
#else
SET_DECL_LLVM (new_friend, 0);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
SET_DECL_ASSEMBLER_NAME (new_friend, NULL_TREE);
}
@@ -6681,13 +6681,13 @@
TREE_TYPE (r) = type;
/* Clear out the mangled name and RTL for the instantiation. */
SET_DECL_ASSEMBLER_NAME (r, NULL_TREE);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
SET_DECL_RTL (r, NULL_RTX);
#else
SET_DECL_LLVM (r, 0);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
DECL_INITIAL (r) = NULL_TREE;
DECL_CONTEXT (r) = ctx;
@@ -7002,21 +7002,21 @@
cp_apply_type_quals_to_decl (cp_type_quals (type), r);
DECL_CONTEXT (r) = ctx;
/* Clear out the mangled name and RTL for the instantiation. */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
SET_DECL_RTL (r, NULL_RTX);
#else
SET_DECL_LLVM (r, 0);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (CODE_CONTAINS_STRUCT (TREE_CODE (t), TS_DECL_WRTL))
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
SET_DECL_RTL (r, NULL_RTX);
#else
SET_DECL_LLVM (r, 0);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* The initializer must not be expanded until it is required;
see [temp.inst]. */
DECL_INITIAL (r) = NULL_TREE;
@@ -12320,13 +12320,13 @@
/* Clear out DECL_RTL; whatever was there before may not be right
since we've reset the type of the declaration. */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
SET_DECL_RTL (d, NULL_RTX);
#else
SET_DECL_LLVM (d, 0);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
DECL_IN_AGGR_P (d) = 0;
/* The initializer is placed in DECL_INITIAL by
Modified: llvm-gcc-4-2/trunk/gcc/cp/typeck.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/cp/typeck.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cp/typeck.c (original)
+++ llvm-gcc-4-2/trunk/gcc/cp/typeck.c Fri Jul 13 03:39:34 2007
@@ -2539,7 +2539,7 @@
return error_mark_node;
}
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Do not create explicit pointer arithmetic for pointer subscripts,
* instead, generate an array ref, even though the first argument is a
@@ -2549,7 +2549,7 @@
return build4 (ARRAY_REF, TREE_TYPE(TREE_TYPE(ar)), ar, ind,
NULL_TREE, NULL_TREE);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
return build_indirect_ref (cp_build_binary_op (PLUS_EXPR, ar, ind),
"array indexing");
}
@@ -4686,13 +4686,13 @@
case ARRAY_REF:
case REALPART_EXPR:
case IMAGPART_EXPR:
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
if (TREE_CODE (x) == ARRAY_REF &&
TREE_CODE (TREE_TYPE (TREE_OPERAND (x, 0))) != ARRAY_TYPE)
return true; /* Ignore pointer base of array ref extension. */
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
x = TREE_OPERAND (x, 0);
break;
Modified: llvm-gcc-4-2/trunk/gcc/crtstuff.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/crtstuff.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/crtstuff.c (original)
+++ llvm-gcc-4-2/trunk/gcc/crtstuff.c Fri Jul 13 03:39:34 2007
@@ -178,25 +178,25 @@
static func_ptr force_to_data[1] __attribute__ ((__unused__)) = { };
asm (CTORS_SECTION_ASM_OP);
STATIC func_ptr __CTOR_LIST__[1]
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef __llvm__
/* FIXME: Remove when external weak linkage will be alive. */
__attribute__ ((__used__, aligned(sizeof(func_ptr))))
#else
__attribute__ ((__unused__, aligned(sizeof(func_ptr))))
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
= { (func_ptr) (-1) };
#else
STATIC func_ptr __CTOR_LIST__[1]
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef __llvm__
/* FIXME: Remove when external weak linkage will be alive. */
__attribute__ ((__used__, section(".ctors"), aligned(sizeof(func_ptr))))
#else
__attribute__ ((__unused__, section(".ctors"), aligned(sizeof(func_ptr))))
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
= { (func_ptr) (-1) };
#endif /* __CTOR_LIST__ alternatives */
@@ -486,25 +486,25 @@
#elif defined(DTORS_SECTION_ASM_OP)
asm (DTORS_SECTION_ASM_OP);
STATIC func_ptr __DTOR_END__[1]
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef __llvm__
/* FIXME: Remove when external weak linkage will be alive. */
__attribute__ ((__used__, aligned(sizeof(func_ptr))))
#else
__attribute__ ((unused, aligned(sizeof(func_ptr))))
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
= { (func_ptr) 0 };
#else
STATIC func_ptr __DTOR_END__[1]
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef __llvm__
/* FIXME: Remove when external weak linkage will be alive. */
__attribute__((__used__, section(".dtors"), aligned(sizeof(func_ptr))))
#else
__attribute__((unused, section(".dtors"), aligned(sizeof(func_ptr))))
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
= { (func_ptr) 0 };
#endif
Modified: llvm-gcc-4-2/trunk/gcc/cse.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/cse.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/cse.c (original)
+++ llvm-gcc-4-2/trunk/gcc/cse.c Fri Jul 13 03:39:34 2007
@@ -3691,11 +3691,11 @@
extends. */
enum machine_mode mode_arg0;
- /* APPLE LOCAL begin LLVM - cc1 code size. */
+ /* LLVM LOCAL begin - cc1 code size. */
#ifdef ENABLE_LLVM
return 0;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (x == 0)
return x;
Modified: llvm-gcc-4-2/trunk/gcc/doc/invoke.texi
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/doc/invoke.texi?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/doc/invoke.texi (original)
+++ llvm-gcc-4-2/trunk/gcc/doc/invoke.texi Fri Jul 13 03:39:34 2007
@@ -423,7 +423,7 @@
@c APPLE LOCAL lno
-fscalar-evolutions -fall-data-deps @gol
--param @var{name}=@var{value}
- at c APPLE LOCAL -fast, -Oz, llvm
+ at c LLVM LOCAL -fast, -Oz,
-O -O0 -O1 -O2 -O3 -O4 (APPLE ONLY) -Os -Oz (APPLE ONLY) -fast (APPLE ONLY)}
@item Preprocessor Options
@@ -5066,12 +5066,12 @@
@option{-O2} and also turns on the @option{-finline-functions},
@option{-funswitch-loops} and @option{-fgcse-after-reload} options.
- at c APPLE LOCAL begin LLVM
+ at c LLVM LOCAL begin
@item -O4
@opindex O4
Enable LLVM Link Time Optimization. @option{-O4} turns on all LLVM compile
time optimizations specified by @option{-O2}.
- at c APPLE LOCAL end LLVM
+ at c LLVM LOCAL end
@item -O0
@opindex O0
Modified: llvm-gcc-4-2/trunk/gcc/emit-rtl.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/emit-rtl.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/emit-rtl.c (original)
+++ llvm-gcc-4-2/trunk/gcc/emit-rtl.c Fri Jul 13 03:39:34 2007
@@ -3111,11 +3111,11 @@
rtx insn_last, insn;
int njumps = 0;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
return 0;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (any_condjump_p (trial)
&& (note = find_reg_note (trial, REG_BR_PROB, 0)))
Modified: llvm-gcc-4-2/trunk/gcc/expr.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/expr.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/expr.c (original)
+++ llvm-gcc-4-2/trunk/gcc/expr.c Fri Jul 13 03:39:34 2007
@@ -172,14 +172,14 @@
static bool float_extend_from_mem[NUM_MACHINE_MODES][NUM_MACHINE_MODES];
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* LLVM always emits moves with memcpy, which allows us to make smart decisions
later. This affects CONSTRUCTOR lowering in the gimplifier. */
#undef MOVE_BY_PIECES_P
#define MOVE_BY_PIECES_P(SIZE, ALIGN) (0*(SIZE)*(ALIGN))
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* This macro is used to determine whether move_by_pieces should be called
to perform a structure copy. */
@@ -5771,7 +5771,7 @@
case ARRAY_RANGE_REF:
{
tree index = TREE_OPERAND (exp, 1);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
tree low_bound, unit_size;
#if ENABLE_LLVM
/* LLVM extends ARRAY_REF to allow pointers to be the base value. */
@@ -5780,7 +5780,7 @@
#endif
low_bound = array_ref_low_bound (exp);
unit_size = array_ref_element_size (exp);
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* We assume all arrays have sizes that are a multiple of a byte.
First subtract the lower bound, if any, in the type of the
@@ -5956,14 +5956,14 @@
case VIEW_CONVERT_EXPR:
case REALPART_EXPR:
case IMAGPART_EXPR:
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Support the "array ref with pointer base" extension. */
if (TREE_CODE (t) == ARRAY_REF &&
TREE_CODE (TREE_TYPE (TREE_OPERAND(t, 0))) != ARRAY_TYPE)
return 0;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
return 1;
default:
@@ -6732,11 +6732,11 @@
int rn = -1;
rtx ret, last = NULL;
- /* APPLE LOCAL begin LLVM - cc1 code size. */
+ /* LLVM LOCAL begin - cc1 code size. */
#ifdef ENABLE_LLVM
return 0;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* Handle ERROR_MARK before anybody tries to access its type. */
if (TREE_CODE (exp) == ERROR_MARK
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/expr.h (original)
+++ llvm-gcc-4-2/trunk/gcc/expr.h Fri Jul 13 03:39:34 2007
@@ -65,13 +65,13 @@
/* If a memory-to-memory move would take MOVE_RATIO or more simple
move-instruction sequences, we will do a movmem or libcall instead. */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
/* Disable target-specific hooks for move/clear ratios. */
#ifdef ENABLE_LLVM
#undef MOVE_RATIO
#undef CLEAR_RATIO
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#ifndef MOVE_RATIO
#if defined (HAVE_movmemqi) || defined (HAVE_movmemhi) || defined (HAVE_movmemsi) || defined (HAVE_movmemdi) || defined (HAVE_movmemti)
Modified: llvm-gcc-4-2/trunk/gcc/final.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/final.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/final.c (original)
+++ llvm-gcc-4-2/trunk/gcc/final.c Fri Jul 13 03:39:34 2007
@@ -77,14 +77,14 @@
#include "cgraph.h"
#include "coverage.h"
-/* APPLE LOCAL begin LLVM - Remove insn-attrtab.o. */
+/* LLVM LOCAL begin - Remove insn-attrtab.o. */
#ifdef ENABLE_LLVM
#undef HAVE_ATTR_length
int insn_current_reference_address (rtx branch) {
return branch == 0;
}
#endif
-/* APPLE LOCAL end LLVM - Remove insn-attrtab.o. */
+/* LLVM LOCAL end - Remove insn-attrtab.o. */
#ifdef XCOFF_DEBUGGING_INFO
#include "xcoffout.h" /* Needed for external data
Modified: llvm-gcc-4-2/trunk/gcc/flags.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/flags.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/flags.h (original)
+++ llvm-gcc-4-2/trunk/gcc/flags.h Fri Jul 13 03:39:34 2007
@@ -388,7 +388,7 @@
/* Whether to emit an overflow warning whose code is C. */
#define issue_strict_overflow_warning(c) (warn_strict_overflow >= (int) (c))
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
extern int flag_llvm_pch_read;
#endif /* ! GCC_FLAGS_H */
Modified: llvm-gcc-4-2/trunk/gcc/fold-const.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/fold-const.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/fold-const.c (original)
+++ llvm-gcc-4-2/trunk/gcc/fold-const.c Fri Jul 13 03:39:34 2007
@@ -5218,11 +5218,11 @@
return 0;
}
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
return 0; /* disable creation of BIT_FIELD_REF, which pessimizes code. */
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* After this point all optimizations will generate bit-field
references, which we might not want. */
@@ -10789,11 +10789,11 @@
/* If this is a comparison of a field, we may be able to simplify it. */
if (((TREE_CODE (arg0) == COMPONENT_REF
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
&& 0/* disable creation of BIT_FIELD_REF, which pessimizes code. */
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
&& lang_hooks.can_use_bit_fields_p ())
|| TREE_CODE (arg0) == BIT_FIELD_REF)
/* Handle the constant case even without -O
Modified: llvm-gcc-4-2/trunk/gcc/fortran/Make-lang.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/fortran/Make-lang.in?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/fortran/Make-lang.in (original)
+++ llvm-gcc-4-2/trunk/gcc/fortran/Make-lang.in Fri Jul 13 03:39:34 2007
@@ -103,7 +103,7 @@
-rm -f gfortran-cross$(exeext)
cp gfortran$(exeext) gfortran-cross$(exeext)
-# APPLE LOCAL begin llvm
+# LLVM LOCAL begin
# Language-independent object files.
F95_BACKEND = $(BACKEND) attribs.o stub-objc.o stub-c.o
@@ -112,7 +112,7 @@
$(F95_BACKEND) $(LIBDEPS)
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(F95_OBJS) $(F95_BACKEND) $(F95_LIBS)
-# APPLE LOCAL end llvm
+# LLVM LOCAL end
gt-fortran-trans.h : s-gtype; @true
#
Modified: llvm-gcc-4-2/trunk/gcc/fortran/f95-lang.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/fortran/f95-lang.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/fortran/f95-lang.c (original)
+++ llvm-gcc-4-2/trunk/gcc/fortran/f95-lang.c Fri Jul 13 03:39:34 2007
@@ -833,13 +833,13 @@
TREE_PUBLIC (decl) = 1;
if (library_name)
SET_DECL_ASSEMBLER_NAME (decl, get_identifier (library_name));
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
make_decl_rtl (decl);
#else
make_decl_llvm (decl);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
pushdecl (decl);
DECL_BUILT_IN_CLASS (decl) = class;
DECL_FUNCTION_CODE (decl) = function_code;
Modified: llvm-gcc-4-2/trunk/gcc/fortran/trans-decl.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/fortran/trans-decl.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/fortran/trans-decl.c (original)
+++ llvm-gcc-4-2/trunk/gcc/fortran/trans-decl.c Fri Jul 13 03:39:34 2007
@@ -1551,13 +1551,13 @@
}
/* Create RTL for function definition. */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
make_decl_rtl (fndecl);
#else
make_decl_llvm (fndecl);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
init_function_start (fndecl);
@@ -3317,13 +3317,13 @@
rest_of_decl_compilation (fndecl, 1, 0);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
make_decl_rtl (fndecl);
#else
make_decl_llvm (fndecl);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
init_function_start (fndecl);
Modified: llvm-gcc-4-2/trunk/gcc/function.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/function.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/function.c (original)
+++ llvm-gcc-4-2/trunk/gcc/function.c Fri Jul 13 03:39:34 2007
@@ -3901,11 +3901,11 @@
cfun = DECL_STRUCT_FUNCTION (fndecl);
else
allocate_struct_function (fndecl);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
return;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
init_emit ();
init_varasm_status (cfun);
init_expr ();
@@ -3953,9 +3953,9 @@
cfun->iasm_noreturn = DECL_IASM_NORETURN (subr);
cfun->iasm_frame_size = DECL_IASM_FRAME_SIZE (subr);
}
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* APPLE LOCAL end CW asm blocks */
/* Prevent ever trying to delete the first instruction of a
function. Also tell final how to output a linenum before the
@@ -3968,9 +3968,9 @@
This makes sure the first insn will never be deleted.
Also, final expects a note to appear there. */
emit_note (NOTE_INSN_DELETED);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* Warn if this value is an aggregate type,
regardless of which calling convention we are using for it. */
if (AGGREGATE_TYPE_P (TREE_TYPE (DECL_RESULT (subr))))
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/gcc.c (original)
+++ llvm-gcc-4-2/trunk/gcc/gcc.c Fri Jul 13 03:39:34 2007
@@ -822,7 +822,7 @@
output will be used by another program. */
static const char *cpp_debug_options = "%{d*}";
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
static const char *llvm_options =
#ifdef ENABLE_LLVM
"%{O4|emit-llvm:%{S:-emit-llvm} \
@@ -833,7 +833,7 @@
"%{emit-llvm:%e--emit-llvm is not supported in this configuration.}"
#endif
;
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* NB: This is shared amongst all front-ends. */
static const char *cc1_options =
/* APPLE LOCAL begin -fast */
@@ -842,7 +842,7 @@
%{fastcp:-O3}"
/* APPLE LOCAL end -fast */
"%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
-"/* APPLE LOCAL llvm */"\
+"/* LLVM LOCAL */"\
%1 %{!Q:-quiet} -dumpbase %B %{d*} %{Zmllvm*: -mllvm %*} %{m*} %{a*}\
%{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}}\
%{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs}\
@@ -859,10 +859,10 @@
static const char *invoke_as =
#ifdef AS_NEEDS_DASH_FOR_PIPED_INPUT
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
"%{!O4:%{!emit-llvm:%{!S:-o %|.s |\n as %(asm_options) %|.s %A }}}";
#else
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
"%{!O4:%{!emit-llvm:%{!S:-o %|.s |\n as %(asm_options) %m.s %A }}}";
#endif
@@ -1009,17 +1009,17 @@
%{save-temps|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
%(cpp_options) -o %{save-temps:%b.i} %{!save-temps:%g.i}}\
%{!save-temps:%{!traditional-cpp:%{!no-integrated-cpp:\
- "/* APPLE LOCAL LLVM */"\
+ "/* LLVM LOCAL */"\
cc1 %(cpp_unique_options) %(llvm_options) %(cc1_options)}}\
%{!fsyntax-only:%(invoke_as)}};:\
%{save-temps|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
%(cpp_options) -o %{save-temps:%b.i} %{!save-temps:%g.i} \n\
"/* APPLE LOCAL predictive compilation */"\
cc1 -fpreprocessed %<fpredictive-compilation* %{save-temps:%b.i} %{!save-temps:%g.i} \
- "/* APPLE LOCAL LLVM */"\
+ "/* LLVM LOCAL */"\
%(llvm_options) %(cc1_options)}\
%{!save-temps:%{!traditional-cpp:%{!no-integrated-cpp:\
- "/* APPLE LOCAL LLVM */"\
+ "/* LLVM LOCAL */"\
cc1 %(cpp_unique_options) %(llvm_options) %(cc1_options)}}}\
%{!fsyntax-only:%(invoke_as)}}}}}", 0, 1, 1},
/* APPLE LOCAL end treat -fast same as -combine --dbj */
@@ -1046,7 +1046,7 @@
{".i", "@cpp-output", 0, 1, 0},
{"@cpp-output",
/* APPLE LOCAL predictive compilation */
- /* APPLE LOCAL llvm */
+ /* LLVM LOCAL */
"%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(llvm_options) %(cc1_options) %<fpredictive-compilation* %{!fsyntax-only:%(invoke_as)}}}}", 0, 1, 0},
/* APPLE LOCAL begin preprocess .s files 2001-07-24 --sts */
/* This is kind of lame; the purpose of having .s and .S be treated
@@ -1145,7 +1145,7 @@
{"--dependencies", "-M", 0},
{"--dump", "-d", "a"},
{"--dumpbase", "-dumpbase", "a"},
- /* APPLE LOCAL LLVM */
+ /* LLVM LOCAL */
{"--emit-llvm", "-emit-llvm", 0 },
{"--encoding", "-fencoding=", "aj"},
{"--entry", "-e", 0},
@@ -1636,7 +1636,7 @@
INIT_STATIC_SPEC ("multilib_options", &multilib_options),
INIT_STATIC_SPEC ("linker", &linker_name_spec),
INIT_STATIC_SPEC ("link_libgcc", &link_libgcc_spec),
- /* APPLE LOCAL LLVM */
+ /* LLVM LOCAL */
INIT_STATIC_SPEC ("llvm_options", &llvm_options),
INIT_STATIC_SPEC ("md_exec_prefix", &md_exec_prefix),
INIT_STATIC_SPEC ("md_startfile_prefix", &md_startfile_prefix),
@@ -4667,7 +4667,7 @@
struct base_temp_name *next;
} *t, *base_temp_names = NULL;
- /* APPLE LOCAL LLVM: apple local portability problem */
+ /* LLVM LOCAL: apple local portability problem */
#ifndef HOST_LACKS_INODE_NUMBERS
if (strcmp (string, input_filename) != 0)
{
@@ -4691,13 +4691,13 @@
return string;
}
}
- /* APPLE LOCAL begin LLVM: apple local portability problem */
+ /* LLVM LOCAL begin: apple local portability problem */
#else
/* This should be fixed sometimes for normal operation */
this_is_basename_derived_file = 0;
return string;
#endif
- /* APPLE LOCAL end LLVM: apple local portability problem */
+ /* LLVM LOCAL end: apple local portability problem */
string_length = strlen (string);
suffix_length = string_length - basename_length;
Modified: llvm-gcc-4-2/trunk/gcc/gimplify.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/gimplify.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/gimplify.c (original)
+++ llvm-gcc-4-2/trunk/gcc/gimplify.c Fri Jul 13 03:39:34 2007
@@ -176,7 +176,7 @@
gcc_assert (c && !c->current_bind_expr);
gimplify_ctxp = c->prev_context;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
/* LLVM wants to know about gimple formal temps. */
for (t = gimplify_ctxp->temps; t ; t = TREE_CHAIN (t))
@@ -184,7 +184,7 @@
#else
t = 0;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (body)
declare_vars (c->temps, body, false);
@@ -546,13 +546,13 @@
block, which means it will go into memory, causing much extra
work in reload and final and poorer code generation, outweighing
the extra memory allocation here. */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
if (1) /* LLVM wants temporaries created in SSA form, never reuse one. */
#else
if (!optimize || !is_formal || TREE_SIDE_EFFECTS (val))
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
ret = create_tmp_from_val (val);
else
{
@@ -1809,11 +1809,11 @@
/* Gimplify the low bound and element type size and put them into
the ARRAY_REF. If these values are set, they have already been
gimplified. */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
/* Handle the LLVM extension that allows: (ARRAY_REF ptr, idx) */
if (!TREE_OPERAND (t, 2) &&
TREE_CODE (TREE_TYPE (TREE_OPERAND (t, 0))) == ARRAY_TYPE)
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
{
tree low = unshare_expr (array_ref_low_bound (t));
if (!is_gimple_min_invariant (low))
@@ -1825,11 +1825,11 @@
}
}
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
/* Handle the LLVM extension that allows: (ARRAY_REF ptr, idx) */
if (!TREE_OPERAND (t, 3) &&
TREE_CODE (TREE_TYPE (TREE_OPERAND (t, 0))) == ARRAY_TYPE)
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
{
tree elmt_type = TREE_TYPE (TREE_TYPE (TREE_OPERAND (t, 0)));
tree elmt_size = unshare_expr (array_ref_element_size (t));
@@ -5518,14 +5518,14 @@
break;
case ARRAY_REF:
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Handle the LLVM "ARRAY_REF with pointer base" extension by treating
pointer-based ARRAY_REFs as binary expressions. */
if (TREE_CODE (TREE_TYPE (TREE_OPERAND (*expr_p, 0))) != ARRAY_TYPE)
goto expr_2;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
case ARRAY_RANGE_REF:
case REALPART_EXPR:
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/global.c (original)
+++ llvm-gcc-4-2/trunk/gcc/global.c Fri Jul 13 03:39:34 2007
@@ -435,11 +435,11 @@
size_t i;
rtx x;
- /* APPLE LOCAL begin LLVM - cc1 code size. */
+ /* LLVM LOCAL begin - cc1 code size. */
#ifdef ENABLE_LLVM
return 0;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
make_accurate_live_analysis ();
@@ -1451,11 +1451,11 @@
: reg_preferred_class (allocno[num].reg));
enum machine_mode mode = PSEUDO_REGNO_MODE (allocno[num].reg);
- /* APPLE LOCAL begin LLVM - cc1 code size. */
+ /* LLVM LOCAL begin - cc1 code size. */
#ifdef ENABLE_LLVM
return;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (accept_call_clobbered)
COPY_HARD_REG_SET (used1, call_fixed_reg_set);
@@ -1852,11 +1852,11 @@
{
int alloc_no = reg_allocno[regno];
- /* APPLE LOCAL begin LLVM - cc1 code size. */
+ /* LLVM LOCAL begin - cc1 code size. */
#ifdef ENABLE_LLVM
return;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (alloc_no >= 0)
{
/* If we have more than one register class,
Modified: llvm-gcc-4-2/trunk/gcc/java/Make-lang.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/java/Make-lang.in?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/java/Make-lang.in (original)
+++ llvm-gcc-4-2/trunk/gcc/java/Make-lang.in Fri Jul 13 03:39:34 2007
@@ -135,7 +135,7 @@
java/parse-scan.o-warn = -Wno-error
java/parse.o-warn = -Wno-error
-# APPLE LOCAL begin llvm
+# LLVM LOCAL begin
# Language-independent object files.
JAVA_BACKEND = $(BACKEND) attribs.o stub-objc.o stub-c.o
@@ -143,7 +143,7 @@
rm -f $@
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(JAVA_OBJS) $(JAVA_BACKEND) $(ZLIB) $(LIBICONV) $(LIBS)
-# APPLE LOCAL end llvm
+# LLVM LOCAL end
gcjh$(exeext): $(GCJH_OBJS) $(LIBDEPS)
rm -f $@
Modified: llvm-gcc-4-2/trunk/gcc/libgcc2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/libgcc2.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/libgcc2.c (original)
+++ llvm-gcc-4-2/trunk/gcc/libgcc2.c Fri Jul 13 03:39:34 2007
@@ -1815,12 +1815,12 @@
extern void *compile_type_assert[sizeof(INFINITY) == sizeof(MTYPE) ? 1 : -1];
/* Ensure that we've lost any extra precision. */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#if defined(__llvm__)
#undef NOTRUNC
#define NOTRUNC 1
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#if NOTRUNC
# define TRUNC(x)
#else
Modified: llvm-gcc-4-2/trunk/gcc/llvm-abi.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/llvm-abi.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/llvm-abi.h (original)
+++ llvm-gcc-4-2/trunk/gcc/llvm-abi.h Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* Processor ABI customization hooks
Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
Contributed by Chris Lattner (sabre at nondot.org)
@@ -338,4 +338,4 @@
#endif
#endif
-/* APPLE LOCAL end LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4-2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/llvm-backend.cpp?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4-2/trunk/gcc/llvm-backend.cpp Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* High-level LLVM backend interface
Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
Contributed by Chris Lattner (sabre at nondot.org)
@@ -1195,4 +1195,4 @@
WriteTypeSymbolic(FS, (const Type*)LLVM, TheModule);
}
-/* APPLE LOCAL end LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4-2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/llvm-convert.cpp?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4-2/trunk/gcc/llvm-convert.cpp Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* High-level LLVM backend interface
Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
Contributed by Chris Lattner (sabre at nondot.org)
@@ -6045,5 +6045,5 @@
return FieldPtr;
}
-/* APPLE LOCAL end LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4-2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/llvm-debug.cpp?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4-2/trunk/gcc/llvm-debug.cpp Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* High-level LLVM backend interface
Copyright (C) 2005 Free Software Foundation, Inc.
Contributed by Jim Laskey (jlaskey at apple.com)
@@ -880,5 +880,5 @@
}
-/* APPLE LOCAL end LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4-2/trunk/gcc/llvm-debug.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/llvm-debug.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/llvm-debug.h (original)
+++ llvm-gcc-4-2/trunk/gcc/llvm-debug.h Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* Internal interfaces between the LLVM backend components
Copyright (C) 2006 Free Software Foundation, Inc.
Contributed by Jim Laskey (jlaskey at apple.com)
@@ -129,4 +129,4 @@
} // end namespace llvm
#endif
-/* APPLE LOCAL end LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4-2/trunk/gcc/llvm-file-ostream.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/llvm-file-ostream.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/llvm-file-ostream.h (original)
+++ llvm-gcc-4-2/trunk/gcc/llvm-file-ostream.h Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* Definition of the oFILEstream class
Copyright (C) 2005 Free Software Foundation, Inc.
Contributed by Chris Lattner (sabre at nondot.org)
Modified: llvm-gcc-4-2/trunk/gcc/llvm-internal.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/llvm-internal.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/llvm-internal.h (original)
+++ llvm-gcc-4-2/trunk/gcc/llvm-internal.h Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* Internal interfaces between the LLVM backend components
Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
Contributed by Chris Lattner (sabre at nondot.org)
@@ -617,4 +617,4 @@
};
#endif
-/* APPLE LOCAL end LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4-2/trunk/gcc/llvm-linker-hack.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/llvm-linker-hack.cpp?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/llvm-linker-hack.cpp (original)
+++ llvm-gcc-4-2/trunk/gcc/llvm-linker-hack.cpp Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* LLVM Library Link Hack
Copyright (C) 2005 Free Software Foundation, Inc.
Contributed by Chris Lattner (sabre at nondot.org)
@@ -82,4 +82,4 @@
llvm::createStripDeadPrototypesPass();
}
-/* APPLE LOCAL end LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4-2/trunk/gcc/llvm-types.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/llvm-types.cpp?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/llvm-types.cpp (original)
+++ llvm-gcc-4-2/trunk/gcc/llvm-types.cpp Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* Tree type to LLVM type converter
Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
Contributed by Chris Lattner (sabre at nondot.org)
@@ -1853,5 +1853,5 @@
return GET_TYPE_LLVM(type);
}
-/* APPLE LOCAL end LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4-2/trunk/gcc/llvm.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/llvm.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/llvm.h (original)
+++ llvm-gcc-4-2/trunk/gcc/llvm.h Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL begin LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* LLVM interface to GCC
Copyright (C) 2005 Free Software Foundation, Inc.
Contributed by Chris Lattner (sabre at nondot.org)
@@ -104,4 +104,4 @@
#endif /* ENABLE_LLVM */
#endif
-/* APPLE LOCAL end LLVM (ENTIRE FILE!) */
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4-2/trunk/gcc/longlong.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/longlong.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/longlong.h (original)
+++ llvm-gcc-4-2/trunk/gcc/longlong.h Fri Jul 13 03:39:34 2007
@@ -96,9 +96,9 @@
for the CPUs below!
(E.g. WE32100, IBM360.) */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#if defined (__GNUC__) && !defined (NO_ASM) && !defined (__llvm__)
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* We sometimes need to clobber "cc" with gcc2, but that would not be
understood by gcc1. Use cpp to avoid major code duplication. */
Modified: llvm-gcc-4-2/trunk/gcc/objc/Make-lang.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/objc/Make-lang.in?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/objc/Make-lang.in (original)
+++ llvm-gcc-4-2/trunk/gcc/objc/Make-lang.in Fri Jul 13 03:39:34 2007
@@ -60,7 +60,7 @@
# APPLE LOCAL begin order files --ilr
cc1obj-dummy$(exeext): $(OBJC_OBJS) $(C_AND_OBJC_OBJS) dummy-checksum.o $(BACKEND) $(LIBDEPS)
- # APPLE LOCAL LLVM
+ # LLVM LOCAL
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(OBJC_OBJS) $(C_AND_OBJC_OBJS) dummy-checksum.o \
$(BACKEND) $(LIBS) $(CC1OBJ_ORDER_FLAGS)
@@ -71,7 +71,7 @@
cc1obj-checksum.o : cc1obj-checksum.c
cc1obj$(exeext): $(OBJC_OBJS) $(C_AND_OBJC_OBJS) cc1obj-checksum.o $(BACKEND) $(LIBDEPS)
- # APPLE LOCAL LLVM
+ # LLVM LOCAL
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(OBJC_OBJS) $(C_AND_OBJC_OBJS) cc1obj-checksum.o \
$(BACKEND) $(LIBS) $(CC1OBJ_ORDER_FLAGS)
Modified: llvm-gcc-4-2/trunk/gcc/objc/config-lang.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/objc/config-lang.in?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/objc/config-lang.in (original)
+++ llvm-gcc-4-2/trunk/gcc/objc/config-lang.in Fri Jul 13 03:39:34 2007
@@ -32,10 +32,10 @@
stagestuff="cc1obj\$(exeext)"
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
# Do not comment target_libs setting
target_libs=target-libobjc
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# Most of the object files for cc1obj actually come from C.
lang_requires="c"
Modified: llvm-gcc-4-2/trunk/gcc/objc/lang-specs.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/objc/lang-specs.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/objc/lang-specs.h (original)
+++ llvm-gcc-4-2/trunk/gcc/objc/lang-specs.h Fri Jul 13 03:39:34 2007
@@ -30,15 +30,15 @@
%{traditional|ftraditional|traditional-cpp:\
%eGNU Objective C no longer supports traditional compilation}\
%{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
- "/* APPLE LOCAL LLVM */" \
+ "/* LLVM LOCAL */" \
cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(llvm_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}\
%{!save-temps:%{!no-integrated-cpp:\
- "/* APPLE LOCAL LLVM */" \
+ "/* LLVM LOCAL */" \
cc1obj %(cpp_unique_options) %(llvm_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
{".mi", "@objc-cpp-output", 0, 0, 0},
{"@objc-cpp-output",
- /* APPLE LOCAL LLVM */
+ /* LLVM LOCAL */
"%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(llvm_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
{"@objective-c-header",
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4-2/trunk/gcc/objc/objc-act.c Fri Jul 13 03:39:34 2007
@@ -3637,7 +3637,7 @@
static tree
start_var_decl (tree type, const char *name)
{
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
tree var = NULL_TREE;
#ifdef ENABLE_LLVM
/* Darwin linker prefers to use 'L' as a prefix. GCC codegen handles this
@@ -3656,7 +3656,7 @@
/* Fall through. Build using 'name' */
#endif
var = build_decl (VAR_DECL, get_identifier (name), type);
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
objc_set_global_decl_fields (var);
return var;
@@ -4124,7 +4124,7 @@
/* APPLE LOCAL begin radar 4590221 */
if (OFFS_MSGSEND_FAST)
{
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
tree umsg_fast_decl;
umsg_fast_decl = build_int_cst (NULL_TREE, OFFS_MSGSEND_FAST);
@@ -4142,7 +4142,7 @@
build_int_cst (NULL_TREE, OFFS_MSGSEND_FAST),
NULL_TREE);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
}
/* APPLE LOCAL end radar 4590221 */
@@ -5854,7 +5854,7 @@
else if (section == prop_names_attr)
sprintf (buf, "_OBJC_PROP_NAME_ATTR_%d", property_name_attr_idx++);
/* APPLE LOCAL end C* property metadata (Radar 4498373) */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
{
/* Darwin linker prefers to use 'L' as a prefix. GCC codegen handles this
@@ -5867,7 +5867,7 @@
#else
ident = get_identifier (buf);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
decl = build_decl (VAR_DECL, ident, build_array_type (char_type_node, 0));
@@ -5881,7 +5881,7 @@
DECL_THIS_STATIC (decl) = 1; /* squash redeclaration errors */
#endif
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
make_decl_rtl (decl);
#else
@@ -5892,7 +5892,7 @@
DECL_PRESERVE_P (decl) = 1;
make_decl_llvm (decl);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
pushdecl_top_level (decl);
return decl;
@@ -8007,7 +8007,7 @@
/* APPLE LOCAL begin radar 4590221 */
if (OFFS_ASSIGNIVAR_FAST)
{
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
tree objc_assign_ivar_fast_decl;
objc_assign_ivar_decl
@@ -8029,7 +8029,7 @@
build_int_cst (NULL_TREE, OFFS_ASSIGNIVAR_FAST),
NULL_TREE);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
}
else
{
@@ -8930,11 +8930,11 @@
/* APPLE LOCAL radar 4695109 */
UOBJC_PROTOCOL_EXT_decl, NULL_TREE);
/* APPLE LOCAL end radar 4585769 - Objective-C 1.0 extensions */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
/* Force 4 byte alignment for protocols */
DECL_ALIGN(decl) = 32;
DECL_USER_ALIGN(decl) = 1;
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
finish_var_decl (decl, initlist);
}
}
@@ -17529,7 +17529,7 @@
}
warn_missing_braces = save_warn_missing_braces;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
{
int i;
@@ -17539,7 +17539,7 @@
DECL_PRESERVE_P (objc_global_trees[i]) = 1;
}
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
}
/* Subroutines of finish_objc. */
@@ -17569,11 +17569,11 @@
tree decl;
tree exp;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
#undef ASM_DECLARE_UNRESOLVED_REFERENCE
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
sprintf (string, "%sobjc_class_name_%s",
(flag_next_runtime ? "." : "__"), name);
@@ -17590,7 +17590,7 @@
decl = build_decl (VAR_DECL, get_identifier (string), char_type_node);
DECL_EXTERNAL (decl) = 1;
TREE_PUBLIC (decl) = 1;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* This decl's name is special. Ask llvm to not add leading underscore by
setting it as a user supplied asm name. */
@@ -17598,7 +17598,7 @@
/* Let optimizer know that this decl is not removable. */
DECL_PRESERVE_P (decl) = 1;
#endif ENABLE_LLVM
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
pushdecl (decl);
rest_of_decl_compilation (decl, 0, 0);
@@ -17611,13 +17611,13 @@
DECL_INITIAL (decl) = exp;
TREE_STATIC (decl) = 1;
TREE_USED (decl) = 1;
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* This decl's name is special. Ask llvm to not add leading underscore by
setting it as a user supplied asm name. */
set_user_assembler_name(decl, string);
#endif ENABLE_LLVM
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* Force the output of the decl as this forces the reference of the class. */
mark_decl_referenced (decl);
@@ -17656,7 +17656,7 @@
/* Do the same for categories. Even though no references to
these symbols are generated automatically by the compiler, it
gives you a handle to pull them into an archive by hand. */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* The * is a sentinel for gcc's back end, but is not wanted by llvm. */
sprintf (string, "%sobjc_category_name_%s_%s",
@@ -17665,16 +17665,16 @@
sprintf (string, "*%sobjc_category_name_%s_%s",
(flag_next_runtime ? "." : "__"), class_name, class_super_name);
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
}
else
return;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
#undef ASM_DECLARE_CLASS_REFERENCE
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
#ifdef ASM_DECLARE_CLASS_REFERENCE
if (flag_next_runtime)
@@ -17695,13 +17695,13 @@
TREE_CONSTANT (decl) = 1;
DECL_CONTEXT (decl) = 0;
DECL_ARTIFICIAL (decl) = 1;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
set_user_assembler_name(decl, string);
/* Let optimizer know that this decl is not removable. */
DECL_PRESERVE_P (decl) = 1;
#endif ENABLE_LLVM
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
DECL_INITIAL (decl) = init;
assemble_variable (decl, 1, 0, 0);
}
Modified: llvm-gcc-4-2/trunk/gcc/objcp/Make-lang.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/objcp/Make-lang.in?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/objcp/Make-lang.in (original)
+++ llvm-gcc-4-2/trunk/gcc/objcp/Make-lang.in Fri Jul 13 03:39:34 2007
@@ -63,7 +63,7 @@
# APPLE LOCAL begin order files --ilr
cc1objplus-dummy$(exeext): $(OBJCXX_OBJS) dummy-checksum.o $(BACKEND) \
$(LIBDEPS)
- # APPLE LOCAL LLVM
+ # LLVM LOCAL
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(OBJCXX_OBJS) dummy-checksum.o $(BACKEND) $(LIBS) \
$(CC1OBJPLUS_ORDER_FLAGS)
@@ -74,7 +74,7 @@
cc1objplus-checksum.o : cc1objplus-checksum.c
cc1objplus$(exeext): $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBDEPS)
- # APPLE LOCAL LLVM
+ # LLVM LOCAL
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBS) \
$(CC1OBJPLUS_ORDER_FLAGS)
Modified: llvm-gcc-4-2/trunk/gcc/objcp/lang-specs.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/objcp/lang-specs.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/objcp/lang-specs.h (original)
+++ llvm-gcc-4-2/trunk/gcc/objcp/lang-specs.h Fri Jul 13 03:39:34 2007
@@ -47,18 +47,18 @@
%(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\
cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.mii} %{!save-temps:%g.mii}}\
%{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
- "/* APPLE LOCAL LLVM */" \
+ "/* LLVM LOCAL */" \
%(llvm_options) %(cc1_options) %2 %{+e1*}\
%{!fsyntax-only:%(invoke_as)}}}}",
CPLUSPLUS_CPP_SPEC, 0, 0},
{".mii", "@objective-c++-cpp-output", 0, 0, 0},
{"@objective-c++-cpp-output",
"%{!M:%{!MM:%{!E:\
- "/* APPLE LOCAL LLVM */" \
+ "/* LLVM LOCAL */" \
cc1objplus -fpreprocessed %i %(llvm_options) %(cc1_options) %2 %{+e*}\
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
{"@objc++-cpp-output",
"%{!M:%{!MM:%{!E:\
- "/* APPLE LOCAL LLVM */" \
+ "/* LLVM LOCAL */" \
cc1objplus -fpreprocessed %i %(llvm_options) %(cc1_options) %2 %{+e*}\
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/optabs.c (original)
+++ llvm-gcc-4-2/trunk/gcc/optabs.c Fri Jul 13 03:39:34 2007
@@ -3415,11 +3415,11 @@
rtx final_dest = target;
rtx prev, next, first, last, insn;
- /* APPLE LOCAL begin LLVM - cc1 code size. */
+ /* LLVM LOCAL begin - cc1 code size. */
#ifdef ENABLE_LLVM
return;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* If this is a reg with REG_USERVAR_P set, then it could possibly turn
into a MEM later. Protect the libcall block from this change. */
@@ -5144,13 +5144,13 @@
a function. Pretend this is "int foo()". */
tree decl;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
return NULL_RTX;
#endif
decl = build_decl (FUNCTION_DECL, get_identifier (name),
build_function_type (integer_type_node, NULL_TREE));
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
DECL_ARTIFICIAL (decl) = 1;
DECL_EXTERNAL (decl) = 1;
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/opts.c (original)
+++ llvm-gcc-4-2/trunk/gcc/opts.c Fri Jul 13 03:39:34 2007
@@ -520,11 +520,11 @@
/* PRE tends to generate bigger code. */
flag_tree_pre = 1;
}
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
/* Enable loop unrolling at -O2 if -f[no-]unroll-loops is not used. */
if (!flag_unroll_loops_set && !optimize_size)
flag_unroll_loops = 1;
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
}
if (optimize >= 3)
@@ -894,11 +894,11 @@
aux_base_name = arg;
break;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
case OPT_mllvm:
llvm_optns = arg;
break;
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
case OPT_auxbase_strip:
{
Modified: llvm-gcc-4-2/trunk/gcc/passes.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/passes.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/passes.c (original)
+++ llvm-gcc-4-2/trunk/gcc/passes.c Fri Jul 13 03:39:34 2007
@@ -82,7 +82,7 @@
#include "tree-flow.h"
#include "tree-pass.h"
#include "tree-dump.h"
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#include "llvm.h"
#ifdef ENABLE_LLVM
@@ -90,7 +90,7 @@
in. */
#undef INSN_SCHEDULING
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
@@ -149,13 +149,13 @@
/* Can't defer this, because it needs to happen before any
later function definitions are processed. */
if (DECL_ASSEMBLER_NAME_SET_P (decl) && DECL_REGISTER (decl))
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
make_decl_rtl (decl);
#else
make_decl_llvm (decl);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* Forward declarations for nested functions are not "external",
but we need to treat them as if they were. */
@@ -196,7 +196,7 @@
information machinery when there are errors. */
&& !(sorrycount || errorcount))
{
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
timevar_push (TV_SYMOUT);
debug_hooks->type_decl (decl, !top_level);
@@ -204,7 +204,7 @@
#else
llvm_emit_typedef (decl);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
}
/* Let cgraph know about the existence of variables. */
@@ -222,7 +222,7 @@
if (errorcount != 0 || sorrycount != 0)
return;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
timevar_push (TV_SYMOUT);
debug_hooks->type_decl (TYPE_STUB_DECL (type), !toplev);
@@ -231,7 +231,7 @@
llvm_emit_typedef (TYPE_STUB_DECL (type));
toplev = toplev; /* avoid unused var warning */
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
}
@@ -243,11 +243,11 @@
struct dump_file_info *dfi;
char *name;
- /* APPLE LOCAL begin LLVM Dead code strip cc1. */
+ /* LLVM LOCAL begin Dead code strip cc1. */
#ifdef ENABLE_LLVM
return;
#endif
- /* APPLE LOCAL end LLVM Dead code strip cc1. */
+ /* LLVM LOCAL end Dead code strip cc1. */
timevar_push (TV_DUMP);
if (profile_arc_flag || flag_test_coverage || flag_branch_probabilities)
Modified: llvm-gcc-4-2/trunk/gcc/print-tree.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/print-tree.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/print-tree.c (original)
+++ llvm-gcc-4-2/trunk/gcc/print-tree.c Fri Jul 13 03:39:34 2007
@@ -29,9 +29,9 @@
#include "ggc.h"
#include "langhooks.h"
#include "tree-iterator.h"
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#include "llvm.h"
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* Define the hash table of nodes already seen.
Such nodes are not repeated; brief cross-references are used. */
@@ -508,7 +508,7 @@
lang_hooks.print_decl (file, node, indent);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
if (DECL_LLVM_SET_P (node))
{
@@ -522,7 +522,7 @@
print_rtl (file, DECL_RTL (node));
}
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (TREE_CODE (node) == PARM_DECL)
{
@@ -664,7 +664,7 @@
lang_hooks.print_type (file, node, indent);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
if (GET_TYPE_LLVM (node))
{
@@ -672,7 +672,7 @@
print_llvm_type (file, GET_TYPE_LLVM (node));
}
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (TYPE_POINTER_TO (node) || TREE_CHAIN (node))
indent_to (file, indent + 3);
Modified: llvm-gcc-4-2/trunk/gcc/recog.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/recog.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/recog.c (original)
+++ llvm-gcc-4-2/trunk/gcc/recog.c Fri Jul 13 03:39:34 2007
@@ -2027,11 +2027,11 @@
int noperands;
rtx body = PATTERN (insn);
- /* APPLE LOCAL begin LLVM - cc1 code size. */
+ /* LLVM LOCAL begin - cc1 code size. */
#ifdef ENABLE_LLVM
return;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
recog_data.insn = NULL;
recog_data.n_operands = 0;
Modified: llvm-gcc-4-2/trunk/gcc/reload1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/reload1.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/reload1.c (original)
+++ llvm-gcc-4-2/trunk/gcc/reload1.c Fri Jul 13 03:39:34 2007
@@ -659,11 +659,11 @@
struct elim_table *ep;
basic_block bb;
- /* APPLE LOCAL begin LLVM - cc1 code size. */
+ /* LLVM LOCAL begin - cc1 code size. */
#ifdef ENABLE_LLVM
return 0;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* APPLE LOCAL begin 4321079 */
from_global = global;
Modified: llvm-gcc-4-2/trunk/gcc/simplify-rtx.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/simplify-rtx.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/simplify-rtx.c (original)
+++ llvm-gcc-4-2/trunk/gcc/simplify-rtx.c Fri Jul 13 03:39:34 2007
@@ -4838,11 +4838,11 @@
enum rtx_code code = GET_CODE (x);
enum machine_mode mode = GET_MODE (x);
- /* APPLE LOCAL begin LLVM - cc1 code size. */
+ /* LLVM LOCAL begin - cc1 code size. */
#ifdef ENABLE_LLVM
return 0;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
switch (GET_RTX_CLASS (code))
{
Modified: llvm-gcc-4-2/trunk/gcc/stor-layout.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/stor-layout.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/stor-layout.c (original)
+++ llvm-gcc-4-2/trunk/gcc/stor-layout.c Fri Jul 13 03:39:34 2007
@@ -313,11 +313,11 @@
gcc_assert (code == VAR_DECL || code == PARM_DECL || code == RESULT_DECL
|| code == TYPE_DECL ||code == FIELD_DECL);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
rtl = DECL_RTL_IF_SET (decl);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (type == error_mark_node)
type = void_type_node;
@@ -513,13 +513,13 @@
DECL_MODE (decl) = VOIDmode;
if (!DECL_USER_ALIGN (decl))
DECL_ALIGN (decl) = 0;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
SET_DECL_RTL (decl, 0);
#else
SET_DECL_LLVM (decl, 0);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
layout_decl (decl, 0);
}
Modified: llvm-gcc-4-2/trunk/gcc/stub-c.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/stub-c.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/stub-c.c (original)
+++ llvm-gcc-4-2/trunk/gcc/stub-c.c Fri Jul 13 03:39:34 2007
@@ -1,4 +1,4 @@
-/* APPLE LOCAL file llvm */
+/* LLVM LOCAL file */
/* Stub functions for C language routines that are referenced
from the back-end.
Copyright (C) 2007 Free Software Foundation, Inc.
Modified: llvm-gcc-4-2/trunk/gcc/system.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/system.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/system.h (original)
+++ llvm-gcc-4-2/trunk/gcc/system.h Fri Jul 13 03:39:34 2007
@@ -602,7 +602,7 @@
# undef true
# undef false
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* For LLVM, we really do want to use the system bool. Because parts of the
* compiler are written in C++ and parts are written in C, the two conceptions
@@ -613,7 +613,7 @@
#else
# define bool unsigned char
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
# define true 1
# define false 0
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/target-def.h (original)
+++ llvm-gcc-4-2/trunk/gcc/target-def.h Fri Jul 13 03:39:34 2007
@@ -84,11 +84,11 @@
#define TARGET_ASM_TTYPE hook_bool_rtx_false
#endif
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifndef TARGET_ARM_TTYPE
#define TARGET_ASM_TTYPE hook_bool_rtx_false
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#ifndef TARGET_ASM_ASSEMBLE_VISIBILITY
#define TARGET_ASM_ASSEMBLE_VISIBILITY default_assemble_visibility
@@ -510,9 +510,9 @@
#endif
/* APPLE LOCAL end mainline 2005-10-12 */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#define TARGET_ARM_EABI_UNWINDER false
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#define TARGET_PROMOTE_FUNCTION_ARGS hook_bool_tree_false
#define TARGET_PROMOTE_FUNCTION_RETURN hook_bool_tree_false
@@ -589,11 +589,11 @@
#define TARGET_SECONDARY_RELOAD default_secondary_reload
#endif
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifndef TARGET_UNWIND_TABLES_DEFAULT
#define TARGET_UNWIND_TABLES_DEFAULT false
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* C++ specific. */
#ifndef TARGET_CXX_GUARD_TYPE
Modified: llvm-gcc-4-2/trunk/gcc/timevar.def
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/timevar.def?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/timevar.def (original)
+++ llvm-gcc-4-2/trunk/gcc/timevar.def Fri Jul 13 03:39:34 2007
@@ -174,10 +174,10 @@
/* Everything else in rest_of_compilation not included above. */
DEFTIMEVAR (TV_REST_OF_COMPILATION , "rest of compilation")
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
DEFTIMEVAR (TV_LLVM_INIT , "llvm backend init")
DEFTIMEVAR (TV_LLVM_FUNCS , "llvm backend functions")
DEFTIMEVAR (TV_LLVM_GLOBALS , "llvm backend globals")
DEFTIMEVAR (TV_LLVM_PERFILE , "llvm backend per file")
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/toplev.c (original)
+++ llvm-gcc-4-2/trunk/gcc/toplev.c Fri Jul 13 03:39:34 2007
@@ -83,9 +83,9 @@
#include "alloc-pool.h"
#include "tree-mudflap.h"
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#include "llvm.h"
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#if defined (DWARF2_UNWIND_INFO) || defined (DWARF2_DEBUGGING_INFO)
#include "dwarf2out.h"
@@ -258,12 +258,12 @@
int flag_short_enums;
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
/* Options to pass directly into the LLVM backend. */
const char *llvm_optns = 0;
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* APPLE LOCAL begin -fast */
/* Nonzero if we should perform SPEC oriented optimizations. */
@@ -1196,14 +1196,14 @@
/* This must be at the end. Some target ports emit end of file directives
into the assembly file here, and hence we can not output anything to the
assembly file after this point. */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
targetm.asm_out.file_end ();
#else
if (!flag_pch_file)
llvm_asm_file_end();
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
}
/* Parse a -d... command line switch. */
@@ -1463,7 +1463,7 @@
if (!flag_syntax_only)
{
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
targetm.asm_out.file_start ();
#else
@@ -1472,7 +1472,7 @@
else
llvm_asm_file_start();
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
#ifdef ASM_COMMENT_START
if (flag_verbose_asm)
@@ -1913,11 +1913,11 @@
default_debug_hooks = &vmsdbg_debug_hooks;
#endif
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
write_symbols = NO_DEBUG;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (write_symbols == NO_DEBUG)
;
#if defined(DBX_DEBUGGING_INFO)
@@ -2075,13 +2075,13 @@
#endif
|| flag_test_coverage);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* note: we need init_emit_once above to initialize ptr_mode and friends. */
llvm_initialize_backend();
return;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
init_rtlanal ();
init_regs ();
@@ -2124,12 +2124,12 @@
init_asm_output (name);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
llvm_lang_dependent_init(name);
return 1; /* don't initialize the RTL backend */
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
/* These create various _DECL nodes, so need to be called after the
front end is initialized. */
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/toplev.h (original)
+++ llvm-gcc-4-2/trunk/gcc/toplev.h Fri Jul 13 03:39:34 2007
@@ -130,9 +130,9 @@
extern int time_report;
/* APPLE LOCAL end optimization pragmas 3124235/3420242 */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
extern const char *llvm_optns;
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* Things to do with target switches. */
extern void print_version (FILE *, const char *);
Modified: llvm-gcc-4-2/trunk/gcc/tree-gimple.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/tree-gimple.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/tree-gimple.c (original)
+++ llvm-gcc-4-2/trunk/gcc/tree-gimple.c Fri Jul 13 03:39:34 2007
@@ -156,7 +156,7 @@
return (is_gimple_val (t) || COMPARISON_CLASS_P (t));
}
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
static inline bool
llvm_is_array_arrayref_extension(tree t)
{
@@ -170,7 +170,7 @@
#endif
return false;
}
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* Return true if T is something whose address can be taken. */
@@ -178,7 +178,7 @@
is_gimple_addressable (tree t)
{
return (is_gimple_id (t) || handled_component_p (t)
- /* APPLE LOCAL LLVM */
+ /* LLVM LOCAL */
|| llvm_is_array_arrayref_extension (t)
|| INDIRECT_REF_P (t));
}
Modified: llvm-gcc-4-2/trunk/gcc/tree-inline.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/tree-inline.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/tree-inline.c (original)
+++ llvm-gcc-4-2/trunk/gcc/tree-inline.c Fri Jul 13 03:39:34 2007
@@ -1262,7 +1262,7 @@
var = modify_dest;
use = NULL;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* The return node can suddenly become multiple assignment. Because of this
* conservatively don't consider this thing for SSA form anymore.
@@ -1270,7 +1270,7 @@
if (DECL_P (var))
DECL_GIMPLE_FORMAL_TEMP_P (var) = 0;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
goto done;
}
}
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/tree-nested.c (original)
+++ llvm-gcc-4-2/trunk/gcc/tree-nested.c Fri Jul 13 03:39:34 2007
@@ -1053,7 +1053,7 @@
of whether a NOP_EXPR or VIEW_CONVERT_EXPR needs a simple value. */
wi->val_only = true;
wi->is_lhs = false;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Support the "array ref with pointer base" extension. */
for (; handled_component_p (t) || TREE_CODE(t) == ARRAY_REF;
@@ -1061,7 +1061,7 @@
#else
for (; handled_component_p (t); tp = &TREE_OPERAND (t, 0), t = *tp)
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
{
if (TREE_CODE (t) == COMPONENT_REF)
walk_tree (&TREE_OPERAND (t, 2), convert_nonlocal_reference, wi,
@@ -1347,7 +1347,7 @@
wi->val_only = true;
wi->is_lhs = false;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Support the "array ref with pointer base" extension. */
for (; handled_component_p (t) || TREE_CODE(t) == ARRAY_REF;
@@ -1355,7 +1355,7 @@
#else
for (; handled_component_p (t); tp = &TREE_OPERAND (t, 0), t = *tp)
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
{
if (TREE_CODE (t) == COMPONENT_REF)
walk_tree (&TREE_OPERAND (t, 2), convert_local_reference, wi,
Modified: llvm-gcc-4-2/trunk/gcc/tree-optimize.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/tree-optimize.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/tree-optimize.c (original)
+++ llvm-gcc-4-2/trunk/gcc/tree-optimize.c Fri Jul 13 03:39:34 2007
@@ -49,7 +49,7 @@
#include "graph.h"
/* APPLE LOCAL optimization pragmas 3124235/3420242 */
#include "opts.h"
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
#include "llvm.h"
#include "cfgloop.h"
#include "except.h"
@@ -470,13 +470,13 @@
tree_register_cfg_hooks ();
/* Perform all tree transforms and optimizations. */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
llvm_emit_code_for_current_function(fndecl);
#else
execute_pass_list (all_passes);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
bitmap_obstack_release (®_obstack);
/* Release the default bitmap obstack. */
Modified: llvm-gcc-4-2/trunk/gcc/tree-pretty-print.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/tree-pretty-print.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/tree-pretty-print.c (original)
+++ llvm-gcc-4-2/trunk/gcc/tree-pretty-print.c Fri Jul 13 03:39:34 2007
@@ -913,13 +913,13 @@
pp_string (buffer, " ...");
pp_character (buffer, ']');
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Support the "pointers in ARRAY_REF" extension */
if (TREE_CODE (TREE_TYPE (op0)) != ARRAY_TYPE)
break;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
op0 = array_ref_low_bound (node);
op1 = array_ref_element_size (node);
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/tree.c (original)
+++ llvm-gcc-4-2/trunk/gcc/tree.c Fri Jul 13 03:39:34 2007
@@ -2000,7 +2000,7 @@
case ARRAY_REF:
case ARRAY_RANGE_REF:
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
if (TREE_CODE (TYPE_SIZE (TREE_TYPE (arg))) == INTEGER_CST
&& TREE_CODE (TREE_OPERAND (arg, 1)) == INTEGER_CST) {
@@ -2022,7 +2022,7 @@
#endif
return staticp (TREE_OPERAND (arg, 0));
} else
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
return false;
default:
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/tree.h (original)
+++ llvm-gcc-4-2/trunk/gcc/tree.h Fri Jul 13 03:39:34 2007
@@ -2148,11 +2148,11 @@
int GTY ((tag ("0"))) address;
char * GTY ((tag ("1"))) pointer;
struct die_struct * GTY ((tag ("2"))) die;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
unsigned GTY ((tag ("3"))) llvm; /* Really an LLVM Type vector (LTypes) index */
} GTY ((desc ("LLVM_IS_ENABLED ? 3 : debug_hooks == &sdb_debug_hooks ? 1 : debug_hooks == &dwarf2_debug_hooks ? 2 : 0"),
descbits ("2"))) symtab;
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
tree name;
tree minval;
tree maxval;
@@ -2687,9 +2687,9 @@
{
struct tree_decl_common common;
rtx rtl;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
unsigned llvm; /* LLVM representation for object. */
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
};
/* In a FIELD_DECL, this is the field position, counting in bytes, of the
@@ -2791,7 +2791,7 @@
which may be different from the type seen in the program. */
#define DECL_ARG_TYPE(NODE) (PARM_DECL_CHECK (NODE)->decl_common.initial)
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
#define LLVM_IS_ENABLED 0
#else
@@ -2853,7 +2853,7 @@
#endif
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
/* For PARM_DECL, holds an RTL for the stack slot or register
where the data was actually passed. */
@@ -4444,9 +4444,9 @@
extern bool tree_expr_nonzero_warnv_p (tree, bool *);
/* In builtins.c */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
extern int validate_arglist (tree, ...);
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
extern tree fold_builtin (tree, tree, bool);
extern tree fold_builtin_fputs (tree, bool, bool, tree);
extern tree fold_builtin_strcpy (tree, tree, tree);
Modified: llvm-gcc-4-2/trunk/gcc/unwind-c.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/unwind-c.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/unwind-c.c (original)
+++ llvm-gcc-4-2/trunk/gcc/unwind-c.c Fri Jul 13 03:39:34 2007
@@ -95,7 +95,7 @@
#define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND
#endif
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef __ARM_EABI_UNWINDER__
/* ARM EABI personality routines must also unwind the stack. */
#define CONTINUE_UNWINDING \
@@ -109,7 +109,7 @@
#else
#define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#ifdef __USING_SJLJ_EXCEPTIONS__
#define PERSONALITY_FUNCTION __gcc_personality_sj0
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=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/gcc/varasm.c (original)
+++ llvm-gcc-4-2/trunk/gcc/varasm.c Fri Jul 13 03:39:34 2007
@@ -53,7 +53,7 @@
#include "cgraph.h"
#include "cfglayout.h"
#include "basic-block.h"
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
#include "llvm.h"
#ifdef XCOFF_DEBUGGING_INFO
@@ -753,7 +753,7 @@
set_user_assembler_name (tree decl, const char *name)
{
char *starred = alloca (strlen (name) + 2);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
starred[0] = '*';
strcpy (starred + 1, name);
@@ -771,15 +771,15 @@
strcpy (starred, name);
}
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
change_decl_assembler_name (decl, get_identifier (starred));
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
SET_DECL_RTL (decl, NULL_RTX);
#else
SET_DECL_LLVM (decl, NULL_RTX);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
}
/* Decode an `asm' spec for a declaration as a register name.
@@ -1198,12 +1198,12 @@
void
assemble_asm (tree string)
{
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
llvm_emit_file_scope_asm(string);
return;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
app_enable ();
@@ -1343,14 +1343,14 @@
|| (DECL_COMMON (decl)
&& (DECL_INITIAL (decl) == 0
|| DECL_INITIAL (decl) == error_mark_node))))
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
|| !MEM_P (DECL_RTL (decl))
#else
|| (DECL_LLVM (decl), 0)
#endif
)
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
return;
/* We win when global object is found, but it is useful to know about weak
@@ -1363,7 +1363,7 @@
const char *p;
const char *name;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
rtx decl_rtl = DECL_RTL (decl);
name = (char*)XSTR (XEXP (decl_rtl, 0), 0);
@@ -1372,7 +1372,7 @@
name = (char*)llvm_get_decl_name(decl_llvm);
#endif
p = targetm.strip_name_encoding (name);
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
name = ggc_strdup (p);
*type = name;
@@ -1772,11 +1772,11 @@
const char *name;
rtx decl_rtl, symbol;
section *sect;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
void *decl_llvm;
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
if (lang_hooks.decls.prepare_assemble_variable)
lang_hooks.decls.prepare_assemble_variable (decl);
@@ -1796,7 +1796,7 @@
if (TREE_CODE (decl) == FUNCTION_DECL)
return;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM /* register globals are not supported */
/* Do nothing for global register variables. */
if (DECL_RTL_SET_P (decl) && REG_P (DECL_RTL (decl)))
@@ -1805,7 +1805,7 @@
return;
}
#endif
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
/* If type was incomplete when the variable was declared,
see if it is complete now. */
@@ -1833,13 +1833,13 @@
/* Make sure targetm.encode_section_info is invoked before we set
ASM_WRITTEN. */
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM /* register globals are not supported */
decl_rtl = DECL_RTL (decl);
#else
decl_llvm = DECL_LLVM (decl);
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
TREE_ASM_WRITTEN (decl) = 1;
@@ -1863,7 +1863,7 @@
gcc_assert (MEM_P (decl_rtl));
gcc_assert (GET_CODE (XEXP (decl_rtl, 0)) == SYMBOL_REF);
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifndef ENABLE_LLVM /* register globals are not supported */
symbol = XEXP (decl_rtl, 0);
name = XSTR (symbol, 0);
@@ -2046,7 +2046,7 @@
open. If it's not, we should not be calling this function. */
gcc_assert (asm_out_file);
- /* APPLE LOCAL llvm */
+ /* LLVM LOCAL */
#if defined(ASM_OUTPUT_EXTERNAL) && !defined(ENABLE_LLVM)
if (!DECL_P (decl) || !DECL_EXTERNAL (decl) || !TREE_PUBLIC (decl))
return;
@@ -4695,7 +4695,7 @@
{
DECL_WEAK (decl) = 1;
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
if (DECL_LLVM_SET_P (decl))
llvm_mark_decl_weak(decl);
@@ -4906,11 +4906,11 @@
}
}
- /* APPLE LOCAL begin LLVM */
+ /* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
return; /* llvm-gcc doesn't need this. */
#endif
- /* APPLE LOCAL end LLVM */
+ /* LLVM LOCAL end */
for (t = weak_decls; t; t = TREE_CHAIN (t))
{
@@ -5031,7 +5031,7 @@
or ASM_OUTPUT_DEF_FROM_DECLS. The function defines the symbol whose
tree node is DECL to have the value of the tree node TARGET. */
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
#ifndef ENABLE_LLVM
static void
do_assemble_alias (tree decl, tree target)
@@ -5111,7 +5111,7 @@
}
#endif
}
-/* APPLE LCOAL LLVM */
+/* LLVM LCOAL */
#endif
/* First pass of completing pending aliases. Make sure that cgraph knows
@@ -5152,7 +5152,7 @@
alias_pair *p;
for (i = 0; VEC_iterate (alias_pair, alias_pairs, i, p); i++)
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
{
tree target_decl;
@@ -5162,7 +5162,7 @@
#else
do_assemble_alias (p->decl, p->target);
#endif
-/*APPLE LOCAL end LLVM */
+/*LLVM LOCAL end */
VEC_truncate (alias_pair, alias_pairs, 0);
}
@@ -5214,13 +5214,13 @@
/* We must force creation of DECL_RTL for debug info generation, even though
we don't use it here. */
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifndef ENABLE_LLVM
make_decl_rtl (decl);
#else
make_decl_llvm (decl);
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
TREE_USED (decl) = 1;
/* A quirk of the initial implementation of aliases required that the user
Modified: llvm-gcc-4-2/trunk/libcpp/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/libcpp/Makefile.in?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/libcpp/Makefile.in (original)
+++ llvm-gcc-4-2/trunk/libcpp/Makefile.in Fri Jul 13 03:39:34 2007
@@ -37,14 +37,14 @@
WARN_CFLAGS = @WARN_CFLAGS@ @WARN_PEDANTIC@ @WERROR@
CPP = @CPP@
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
LLVMBASEPATH = @LLVMBASEPATH@
ifeq ($(LLVMBASEPATH),)
CPPFLAGS = @CPPFLAGS@
else
CPPFLAGS = @CPPFLAGS@ -DENABLE_LLVM
endif
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
EXEEXT = @EXEEXT@
GMSGFMT = @GMSGFMT@
Modified: llvm-gcc-4-2/trunk/libcpp/configure
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/libcpp/configure?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/libcpp/configure (original)
+++ llvm-gcc-4-2/trunk/libcpp/configure Fri Jul 13 03:39:34 2007
@@ -8263,7 +8263,7 @@
_ACEOF
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
# Check whether --enable-llvm or --disable-llvm was given.
if test "${enable_llvm+set}" = set; then
enableval="$enable_llvm"
@@ -8301,7 +8301,7 @@
LLVMBASEPATH=""
fi;
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# Output.
Modified: llvm-gcc-4-2/trunk/libcpp/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/libcpp/configure.ac?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/libcpp/configure.ac (original)
+++ llvm-gcc-4-2/trunk/libcpp/configure.ac Fri Jul 13 03:39:34 2007
@@ -144,7 +144,7 @@
[Define to the widest efficient host integer type at least
as wide as the target's size_t type.])
-# APPLE LOCAL begin LLVM
+# LLVM LOCAL begin
AC_ARG_ENABLE(llvm,
[ --enable-llvm=DIR enable the LLVM backend, use DIR as LLVM root],
[case "${enableval}" in
@@ -173,7 +173,7 @@
],
[LLVMBASEPATH=""])
AC_SUBST(LLVMBASEPATH)
-# APPLE LOCAL end LLVM
+# LLVM LOCAL end
# Output.
Modified: llvm-gcc-4-2/trunk/libcpp/system.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/libcpp/system.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/libcpp/system.h (original)
+++ llvm-gcc-4-2/trunk/libcpp/system.h Fri Jul 13 03:39:34 2007
@@ -383,7 +383,7 @@
#undef TRUE
#undef FALSE
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* For LLVM, we really do want to use the system bool. Because parts of the
* compiler are written in C++ and parts are written in C, the two conceptions
@@ -396,7 +396,7 @@
#else
# define bool unsigned char
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#define true 1
#define false 0
Modified: llvm-gcc-4-2/trunk/libiberty/strsignal.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/libiberty/strsignal.c?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/libiberty/strsignal.c (original)
+++ llvm-gcc-4-2/trunk/libiberty/strsignal.c Fri Jul 13 03:39:34 2007
@@ -549,7 +549,7 @@
#ifndef HAVE_PSIGNAL
void
-/* APPLE LOCAL LLVM */
+/* LLVM LOCAL */
psignal (int signo, const char *message)
{
if (signal_names == NULL)
Modified: llvm-gcc-4-2/trunk/libstdc++-v3/acinclude.m4
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/libstdc%2B%2B-v3/acinclude.m4?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/libstdc++-v3/acinclude.m4 (original)
+++ llvm-gcc-4-2/trunk/libstdc++-v3/acinclude.m4 Fri Jul 13 03:39:34 2007
@@ -2105,13 +2105,13 @@
enable_sjlj_exceptions=no
elif grep __cxa_end_cleanup conftest.s >/dev/null 2>&1 ; then
enable_sjlj_exceptions=no
- #APPLE LOCAL begin LLVM
+ #LLVM LOCAL begin
elif grep __cxa_end_cleanup conftest.s >/dev/null 2>&1 ; then
enable_sjlj_exceptions=no
- #APPLE LOCAL end LLVM
+ #LLVM LOCAL end
fi
fi
- # APPLE LOCAL LLVM HACK!
+ # LLVM LOCAL HACK!
enable_sjlj_exceptions=no
CXXFLAGS="$old_CXXFLAGS"
rm -f conftest*
Modified: llvm-gcc-4-2/trunk/libstdc++-v3/config/cpu/i486/atomicity.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/libstdc%2B%2B-v3/config/cpu/i486/atomicity.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/libstdc++-v3/config/cpu/i486/atomicity.h (original)
+++ llvm-gcc-4-2/trunk/libstdc++-v3/config/cpu/i486/atomicity.h Fri Jul 13 03:39:34 2007
@@ -35,28 +35,28 @@
__attribute__ ((__unused__))
__exchange_and_add(volatile _Atomic_word* __mem, int __val)
{
-// APPLE LOCAL LLVM
+// LLVM LOCAL
#ifndef __llvm__
register _Atomic_word __result;
__asm__ __volatile__ ("lock; xadd{l} {%0,%1|%1,%0}"
: "=r" (__result), "=m" (*__mem)
: "0" (__val), "m" (*__mem));
return __result;
- // APPLE LOCAL begin LLVM
+ // LLVM LOCAL begin
#else
// FIXME: implement inline asm.
_Atomic_word __result = *__mem;
*__mem += __val;
return __result;
#endif
- // APPLE LOCAL end LLVM
+ // LLVM LOCAL end
}
void
__attribute__ ((__unused__))
__atomic_add(volatile _Atomic_word* __mem, int __val)
{
-// APPLE LOCAL LLVM
+// LLVM LOCAL
#ifndef __llvm__
__asm__ __volatile__ ("lock; add{l} {%1,%0|%0,%1}"
: "=m" (*__mem) : "ir" (__val), "m" (*__mem));
Modified: llvm-gcc-4-2/trunk/libstdc++-v3/config/cpu/powerpc/atomic_word.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/libstdc%2B%2B-v3/config/cpu/powerpc/atomic_word.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/libstdc++-v3/config/cpu/powerpc/atomic_word.h (original)
+++ llvm-gcc-4-2/trunk/libstdc++-v3/config/cpu/powerpc/atomic_word.h Fri Jul 13 03:39:34 2007
@@ -31,7 +31,7 @@
#define _GLIBCXX_ATOMIC_WORD_H 1
typedef int _Atomic_word;
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifndef __llvm__ /* FIXME: implement inline asm */
#define _GLIBCXX_READ_MEM_BARRIER __asm __volatile ("isync":::"memory")
#ifdef __NO_LWSYNC__
@@ -40,5 +40,5 @@
#define _GLIBCXX_WRITE_MEM_BARRIER __asm __volatile ("lwsync":::"memory")
#endif
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
#endif
Modified: llvm-gcc-4-2/trunk/libstdc++-v3/configure
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/libstdc%2B%2B-v3/configure?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/libstdc++-v3/configure (original)
+++ llvm-gcc-4-2/trunk/libstdc++-v3/configure Fri Jul 13 03:39:34 2007
@@ -5385,7 +5385,7 @@
enable_sjlj_exceptions=no
fi
fi
- # APPLE LOCAL LLVM HACK!
+ # LLVM LOCAL HACK!
enable_sjlj_exceptions=no
CXXFLAGS="$old_CXXFLAGS"
rm -f conftest*
Modified: llvm-gcc-4-2/trunk/libstdc++-v3/libsupc++/eh_personality.cc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/libstdc%2B%2B-v3/libsupc%2B%2B/eh_personality.cc?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/libstdc++-v3/libsupc++/eh_personality.cc (original)
+++ llvm-gcc-4-2/trunk/libstdc++-v3/libsupc++/eh_personality.cc Fri Jul 13 03:39:34 2007
@@ -38,11 +38,11 @@
#define NO_SIZE_OF_ENCODED_VALUE
#endif
-// APPLE LOCAL begin LLVM
+// LLVM LOCAL begin
#ifdef __ARM_EABI_UNWINDER__
#define NO_SIZE_OF_ENCODED_VALUE
#endif
-// APPLE LOCAL end LLVM
+// LLVM LOCAL end
#include "unwind-pe.h"
@@ -204,7 +204,7 @@
// Return an element from a type table.
-// APPLE LOCAL begin LLVM
+// LLVM LOCAL begin
#ifdef __ARM_EABI_UNWINDER__
// Return an element from a type table.
@@ -311,7 +311,7 @@
while (0)
#else
-// APPLE LOCAL end LLVM
+// LLVM LOCAL end
typedef const std::type_info _throw_typet;
@@ -434,7 +434,7 @@
#endif // !__ARM_EABI_UNWINDER__
-// APPLE LOCAL begin LLVM
+// LLVM LOCAL begin
// Save stage1 handler information in the exception object
static inline void
@@ -477,7 +477,7 @@
#define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND
#endif // !__ARM_EABI_UNWINDER__
-// APPLE LOCAL end LLVM
+// LLVM LOCAL end
// Return true if the filter spec is empty, ie throw().
Modified: llvm-gcc-4-2/trunk/libstdc++-v3/libsupc++/unwind-cxx.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/libstdc%2B%2B-v3/libsupc%2B%2B/unwind-cxx.h?rev=39798&r1=39797&r2=39798&view=diff
==============================================================================
--- llvm-gcc-4-2/trunk/libstdc++-v3/libsupc++/unwind-cxx.h (original)
+++ llvm-gcc-4-2/trunk/libstdc++-v3/libsupc++/unwind-cxx.h Fri Jul 13 03:39:34 2007
@@ -226,7 +226,7 @@
#define __GXX_INIT_EXCEPTION_CLASS(c) c = __gxx_exception_class
-// APPLE LOCAL begin LLVM
+// LLVM LOCAL begin
static inline bool
__is_gxx_exception_class(_Unwind_Exception_Class c)
{
@@ -234,7 +234,7 @@
}
#define __GXX_INIT_EXCEPTION_CLASS(c) c = __gxx_exception_class
-// APPLE LOCAL end LLVM
+// LLVM LOCAL end
// GNU C++ personality routine, Version 0.
extern "C" _Unwind_Reason_Code __gxx_personality_v0
More information about the llvm-commits
mailing list