[llvm-branch-commits] [llvm-gcc-branch] r127501 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ build_gcc gcc/Makefile.in

[Stuart Hastings]

Author: stuart
Date: Fri Mar 11 16:51:01 2011
New Revision: 127501

URL: http://llvm.org/viewvc/llvm-project?rev=127501&view=rev
Log:
Merge r127261-127262 into Morbo branch, dropping PPC support.  <rdar://problem/8637926>

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/build_gcc
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/Makefile.in

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 11 16:51:01 2011
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99262,99305,99412,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,101614,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,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,113248,114961,118368,118749
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99262,99305,99412,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,101614,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,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,113248,114961,118368,118749,127261-127262

Modified: llvm-gcc-4.2/branches/Apple/Morbo/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/build_gcc?rev=127501&r1=127500&r2=127501&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/build_gcc Fri Mar 11 16:51:01 2011
@@ -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
 

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/Makefile.in?rev=127501&r1=127500&r2=127501&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/Makefile.in (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/Makefile.in Fri Mar 11 16:51:01 2011
@@ -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