Copy of llvmgc42-2332.3 + r110272.
llvm-svn: 110275
diff --git a/llvm-gcc-4.2/GNUmakefile b/llvm-gcc-4.2/GNUmakefile
index 955dfd5..89dcb10 100644
--- a/llvm-gcc-4.2/GNUmakefile
+++ b/llvm-gcc-4.2/GNUmakefile
@@ -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 \
diff --git a/llvm-gcc-4.2/gcc/config/rs6000/t-darwin b/llvm-gcc-4.2/gcc/config/rs6000/t-darwin
index 02a5a73..4d0484e 100644
--- a/llvm-gcc-4.2/gcc/config/rs6000/t-darwin
+++ b/llvm-gcc-4.2/gcc/config/rs6000/t-darwin
@@ -26,8 +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 begin 8260893
+MULTILIB_EXTRA_OPTS = isysroot/Developer/SDKs/MacOSX10.6.sdk mmacosx-version-min=10.6
# LLVM LOCAL end
# Export the _xlq* symbols from darwin-ldouble.c.
