X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllc%2FMakefile;h=847a175d25d7fb665f755dd4a32430609ce94a0b;hb=3da59db637a887474c1b1346c1f3ccf53b6c4663;hp=1e5036700648bee5376c2902175c281f2cd2f8d5;hpb=2c6584a72f329dd41f13c495de847a11e32357bf;p=oota-llvm.git

diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index 1e503670064..847a175d25d 100644
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -9,71 +9,14 @@
 
 LEVEL = ../..
 TOOLNAME = llc
+REQUIRES_EH := 1
 
 # Include this here so we can get the configuration of the targets
 # that have been configured for construction. We have to do this 
-# early so we can set up USEDLIBS properly before includeing Makefile.rules
+# early so we can set up LINK_COMPONENTS before including Makefile.rules
 include $(LEVEL)/Makefile.config
 
-# Initialize the USEDLIBS so we can add to it
-USEDLIBS :=
-
-# Check for LLVMCBackend  target
-ifneq ($(strip $(filter CBackend,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMCBackend
-endif
-
-# Check for Skeleton target
-ifneq ($(strip $(filter Skeleton,$(TARGETS_TO_BUILD))),)
-USEDLIB += LLVMSkeleton
-endif
-
-# Check for Sparc target
-ifneq ($(strip $(filter SparcV8,$(TARGETS_TO_BUILD))),)
-USEDLIBS += \
-	LLVMSparcV9ModuloSched \
-	LLVMSparcV8 \
-	LLVMSparcV9 \
-	LLVMSparcV9RegAlloc \
-	LLVMSparcV9InstrSched \
-	LLVMSparcV9LiveVar
-endif
-
-#Check for X86 Target
-ifneq ($(strip $(filter X86,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMX86
-endif
-
-#Check for PowerPC Target
-ifneq ($(strip $(filter PowerPC,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMPowerPC
-endif
-
-#Check for Alpha Target
-ifneq ($(strip $(filter Alpha,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMAlpha
-endif
-
-#Check for IA64 Target
-ifneq ($(strip $(filter IA64,$(TARGETS_TO_BUILD))),)
-USEDLIBS += LLVMIA64
-endif
-
-USEDLIBS += \
-	LLVMSelectionDAG \
-	LLVMCodeGen \
-	LLVMTarget.a \
-	LLVMipa.a \
-	LLVMTransforms.a \
-	LLVMScalarOpts \
-	LLVMAnalysis.a \
-	LLVMTransformUtils.a \
-	LLVMBCReader \
-	LLVMBCWriter \
-	LLVMCore \
-	LLVMSupport.a \
-	LLVMbzip2 \
-	LLVMSystem.a
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) bcreader
 
 include $(LLVM_SRC_ROOT)/Makefile.rules