[llvm-branch-commits] [llvm-gcc-tag] r110508 - in /llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2: ./ ChangeLog.apple GNUmakefile Makefile.in build_gcc gcc/config/rs6000/t-darwin gcc/llvm-backend.cpp gcc/tree.h gcc/varasm.c
Bill Wendling
isanbard at gmail.com
Fri Aug 6 23:26:12 PDT 2010
Author: void
Date: Sat Aug 7 01:26:12 2010
New Revision: 110508
URL: http://llvm.org/viewvc/llvm-project?rev=110508&view=rev
Log:
Copy of 2333.1 with r110501 and with r107442 reverted. Also don't install LTO
library.
Added:
llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/ (props changed)
- copied from r110282, llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.1/
Modified:
llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/ChangeLog.apple
llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/GNUmakefile
llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/Makefile.in
llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/build_gcc
llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/config/rs6000/t-darwin
llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/llvm-backend.cpp
llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/tree.h
llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/varasm.c
Propchange: llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Aug 7 01:26:12 2010
@@ -0,0 +1,2 @@
+/llvm/trunk:100565
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107843,108784-108786,109556-109557,110272,110501
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/ChangeLog.apple?rev=110508&r1=110282&r2=110508&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/ChangeLog.apple (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/ChangeLog.apple Sat Aug 7 01:26:12 2010
@@ -1,3 +1,20 @@
+2010-08-06 Bob Wilson <bob.wilson at apple.com>
+
+ Radar 8277973
+ * Makefile.in (FLAGS_FOR_TARGET): Add $(SYSROOT_CFLAGS_FOR_TARGET).
+ * build_gcc: Configure for powerpc using --with-build-sysroot.
+
+2010-07-29 Bob Wilson <bob.wilson at apple.com>
+
+ Radar 7982386
+ * mode-hdrs: Remove this directory and all its contents.
+ * build_gcc: Stop installing files from more-hdrs.
+
+2010-07-29 Bob Wilson <bob.wilson at apple.com>
+
+ Radar 7982386
+ * more-hdrs/ppc_intrinsics.h: Moved to gcc/config/rs6000.
+
2010-06-28 Jim Grosbach <grosbach at apple.com>
Radar 7449793
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/GNUmakefile?rev=110508&r1=110282&r2=110508&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/GNUmakefile (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/GNUmakefile Sat Aug 7 01:26:12 2010
@@ -90,7 +90,7 @@
SYMROOT=$(OBJROOT)/sym-llvmCore \
DSTROOT=$(OBJROOT)/dst-llvmCore llvmCore
$(MAKE) LLVMCORE_PATH=$(OBJROOT)/dst-llvmCore/Developer/usr/local \
- INSTALL_LIBLTO=yes llvmgcc42
+ INSTALL_LIBLTO=no llvmgcc42
llvmCore: $(OBJROOT) $(SYMROOT) $(DSTROOT)
if [ ! -d $(SRC)/llvmCore ]; then \
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/Makefile.in?rev=110508&r1=110282&r2=110508&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/Makefile.in (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/Makefile.in Sat Aug 7 01:26:12 2010
@@ -308,7 +308,8 @@
# Programs producing files for the TARGET machine
# -----------------------------------------------
-FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
+# APPLE LOCAL 8277973 Add sysroot flag here.
+FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ $(SYSROOT_CFLAGS_FOR_TARGET)
AR_FOR_TARGET=@AR_FOR_TARGET@
AS_FOR_TARGET=@AS_FOR_TARGET@
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/build_gcc?rev=110508&r1=110282&r2=110508&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/build_gcc (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/build_gcc Sat Aug 7 01:26:12 2010
@@ -118,6 +118,10 @@
NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=/usr/include/c++/$LIBSTDCXX_VERSION"
# LLVM LOCAL end
+# Build against the MacOSX10.5 SDK for PowerPC.
+PPC_SYSROOT=/Developer/SDKs/MacOSX10.5.sdk
+PPC_CONFIGFLAGS="$NON_ARM_CONFIGFLAGS --with-build-sysroot=\"$PPC_SYSROOT\""
+
DARWIN_VERS=`uname -r | sed 's/\..*//'`
echo DARWIN_VERS = $DARWIN_VERS
@@ -367,6 +371,8 @@
AS_FOR_TARGET=$DIR/bin/${t}-apple-darwin$DARWIN_VERS-as \
LD_FOR_TARGET=$DIR/bin/${t}-apple-darwin$DARWIN_VERS-ld \
$SRC_DIR/configure $T_CONFIGFLAGS $ARM_CONFIGFLAGS || exit 1
+ elif [ $t = 'powerpc' ] ; then
+ $SRC_DIR/configure $T_CONFIGFLAGS $PPC_CONFIGFLAGS || exit 1
else
$SRC_DIR/configure $T_CONFIGFLAGS $NON_ARM_CONFIGFLAGS || exit 1
fi
@@ -428,6 +434,8 @@
--target=$t-apple-darwin$DARWIN_VERS"
if [ $t = 'arm' ] && [ $h != 'arm' ] ; then
T_CONFIGFLAGS="$T_CONFIGFLAGS $ARM_CONFIGFLAGS"
+ elif [ $t = 'powerpc' ] && [ $h != 'powerpc' ] ; then
+ T_CONFIGFLAGS="$T_CONFIGFLAGS $PPC_CONFIGFLAGS"
else
T_CONFIGFLAGS="$T_CONFIGFLAGS $NON_ARM_CONFIGFLAGS"
fi
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/config/rs6000/t-darwin
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/config/rs6000/t-darwin?rev=110508&r1=110282&r2=110508&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/config/rs6000/t-darwin (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/config/rs6000/t-darwin Sat Aug 7 01:26:12 2010
@@ -26,9 +26,8 @@
# APPLE LOCAL end gcov 5573505
# APPLE LOCAL 5901604 6499452
-# LLVM LOCAL begin
-#MULTILIB_EXTRA_OPTS = isysroot/Developer/SDKs/MacOSX10.5.sdk mmacosx-version-min=10.5
-# LLVM LOCAL end
+# LLVM LOCAL 8260893
+MULTILIB_EXTRA_OPTS = isysroot/Developer/SDKs/MacOSX10.5.sdk mmacosx-version-min=10.5
# Export the _xlq* symbols from darwin-ldouble.c.
SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-ppc64.ver
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/llvm-backend.cpp?rev=110508&r1=110282&r2=110508&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/llvm-backend.cpp Sat Aug 7 01:26:12 2010
@@ -1154,8 +1154,6 @@
Linkage = GlobalValue::PrivateLinkage;
else if (DECL_LLVM_LINKER_PRIVATE(decl))
Linkage = GlobalValue::LinkerPrivateLinkage;
- else if (DECL_LLVM_LINKER_PRIVATE_WEAK(decl))
- Linkage = GlobalValue::LinkerPrivateWeakLinkage;
else if (DECL_WEAK(decl))
// The user may have explicitly asked for weak linkage - ignore flag_odr.
Linkage = GlobalValue::WeakAnyLinkage;
@@ -1422,9 +1420,6 @@
} else if (CODE_CONTAINS_STRUCT (TREE_CODE (decl), TS_DECL_WITH_VIS)
&& DECL_LLVM_LINKER_PRIVATE(decl)) {
Linkage = GlobalValue::LinkerPrivateLinkage;
- } else if (CODE_CONTAINS_STRUCT (TREE_CODE (decl), TS_DECL_WITH_VIS)
- && DECL_LLVM_LINKER_PRIVATE_WEAK(decl)) {
- Linkage = GlobalValue::LinkerPrivateWeakLinkage;
} else if (!TREE_PUBLIC(decl)) {
Linkage = GlobalValue::InternalLinkage;
} else if (DECL_WEAK(decl)) {
@@ -1493,8 +1488,7 @@
// Handle used decls
if (DECL_PRESERVE_P (decl)) {
- if (DECL_LLVM_LINKER_PRIVATE (decl) ||
- DECL_LLVM_LINKER_PRIVATE_WEAK (decl))
+ if (DECL_LLVM_LINKER_PRIVATE (decl))
AttributeCompilerUsedGlobals.insert(GV);
else
AttributeUsedGlobals.insert(GV);
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/tree.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/tree.h?rev=110508&r1=110282&r2=110508&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/tree.h (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/tree.h Sat Aug 7 01:26:12 2010
@@ -2937,9 +2937,6 @@
(DECL_WITH_VIS_CHECK (NODE)->decl_with_vis.llvm_private_flag)
#define DECL_LLVM_LINKER_PRIVATE(NODE) \
(DECL_WITH_VIS_CHECK (NODE)->decl_with_vis.llvm_linker_private_flag)
-/* LLVM LOCAL - linker_private_weak <rdar://problem/7907014> */
-#define DECL_LLVM_LINKER_PRIVATE_WEAK(NODE) \
- (DECL_WITH_VIS_CHECK (NODE)->decl_with_vis.llvm_linker_private_weak_flag)
#endif
/* LLVM LOCAL end */
@@ -3083,8 +3080,6 @@
/* LLVM LOCAL begin */
unsigned llvm_private_flag : 1;
unsigned llvm_linker_private_flag : 1;
- /* LLVM LOCAL - linker_private_weak <rdar://problem/7907014> */
- unsigned llvm_linker_private_weak_flag : 1;
/* LLVM LOCAL end */
ENUM_BITFIELD(symbol_visibility) visibility : 2;
Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/varasm.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/varasm.c?rev=110508&r1=110282&r2=110508&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/varasm.c (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2333.2/gcc/varasm.c Sat Aug 7 01:26:12 2010
@@ -787,8 +787,7 @@
if (has_objc_prefix) {
DECL_LLVM_PRIVATE (decl) = (name[0] == 'L');
- DECL_LLVM_LINKER_PRIVATE (decl) = (name[0] == 'l' && !DECL_WEAK (decl));
- DECL_LLVM_LINKER_PRIVATE_WEAK(decl)=(name[0] == 'l' && DECL_WEAK(decl));
+ DECL_LLVM_LINKER_PRIVATE (decl) = (name[0] == 'l');
/* Remove the "[Ll]_" prefix. The LLVM assembly printer is now
intelligent enough to add the appropriate prefix to the name. */
More information about the llvm-branch-commits
mailing list