Merge r127261-127262 into Morbo branch, dropping PPC support. <rdar://problem/8637926>
llvm-svn: 127501
diff --git a/llvm-gcc-4.2/build_gcc b/llvm-gcc-4.2/build_gcc
index 4216adc..4e25431 100755
--- a/llvm-gcc-4.2/build_gcc
+++ b/llvm-gcc-4.2/build_gcc
@@ -804,7 +804,8 @@
fi
# Remove lto.h from the install directory; clang will supply.
-find $DEST_DIR -name lto.h -print | xargs rm || exit 1
+# Also remove ppc_intrinsics.h. Note that this breaks PPC support.
+find $DEST_DIR \( -name lto.h -o -name ppc_intrinsics.h \) -delete -print || exit 1
# LLVM LOCAL end
diff --git a/llvm-gcc-4.2/gcc/Makefile.in b/llvm-gcc-4.2/gcc/Makefile.in
index 5cc753f..cc12c8a 100644
--- a/llvm-gcc-4.2/gcc/Makefile.in
+++ b/llvm-gcc-4.2/gcc/Makefile.in
@@ -1177,14 +1177,13 @@
# If in BUILD_LLVM_INTO_A_DYLIB mode, always link in the x86/ppc backends.
# See below for more details.
ifdef BUILD_LLVM_INTO_A_DYLIB
-LLVMTARGETOBJ := $(sort $(LLVMTARGETOBJ) x86 powerpc arm)
+LLVMTARGETOBJ := $(sort $(LLVMTARGETOBJ) x86 arm)
## Target symbols to force linking. This is to ensure that the code generators
## and asm printers actually get linked into libllvmgcc<stage>.dylib.
LLVMTARGETSYMBOLS := \
_LLVMInitializeARMTarget _LLVMInitializeARMAsmPrinter \
- _LLVMInitializePowerPCTarget _LLVMInitializePowerPCAsmPrinter\
_LLVMInitializeX86Target _LLVMInitializeX86AsmPrinter \
endif
