X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Flli%2FMakefile;h=b070cee27146c4deefc8405bd583047c7ba696bd;hb=ebcba612b537f45a033ccd9a60bee0c45e2e2ded;hp=403c3965281c2d2a48b6e2fa00567ff276c6f85f;hpb=7c4c98d9860dfa5a5efbd354589ee64e43b8a5bd;p=oota-llvm.git

diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index 403c3965281..b070cee2714 100644
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -2,56 +2,14 @@
 # 
 #                     The LLVM Compiler Infrastructure
 #
-# This file was developed by the LLVM research group and is distributed under
-# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
-LEVEL = ../..
-TOOLNAME = lli
 
-# Get the $(ARCH) setting
-include $(LEVEL)/Makefile.config
-
-# Generic JIT libraries
-JITLIBS   = lli-jit codegen executionengine
-ARCHLIBS  =
-
-# You can enable the X86 JIT on a non-X86 host by setting the flag
-# ENABLE_X86_JIT on the make command line. If not, it will still be
-# enabled automagically on an X86 host.
-ifeq ($(ARCH), x86)
-  ENABLE_X86_JIT = 1
-endif
-
-# What the X86 JIT requires
-ifdef ENABLE_X86_JIT
-  CPPFLAGS += -DENABLE_X86_JIT
-  JITLIBS  += x86 selectiondag
-  # X86 doesn't require any ARCHLIBS
-endif
-
-# You can enable the Sparc JIT on a non-Sparc host by setting the flag
-# ENABLE_SPARC_JIT on the make command line. If not, it will still be
-# enabled automagically on an Sparc host.
-ifeq ($(ARCH), Sparc)
-  ENABLE_SPARC_JIT = 1
-endif
-
-# What the Sparc JIT requires
-ifdef ENABLE_SPARC_JIT
-  CPPFLAGS += -DENABLE_SPARC_JIT
-  JITLIBS  += sparcv9
-  ARCHLIBS += sched sparcv9livevar instrument.a profpaths \
-              bcwriter transforms.a ipo.a ipa.a datastructure.a \
-              sparcv9regalloc
-endif
-
-USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \
-           transformutils.a bcreader vmcore support target.a LLVMsystem.a
-
-# Have gcc tell the linker to export symbols from the program so that
-# dynamically loaded modules can be linked against them.
-#
-TOOLLINKOPTS = $(PLATFORMLIBDL)
+LEVEL    := ../..
+TOOLNAME := lli
+LINK_COMPONENTS := jit interpreter native bitreader selectiondag
 
+# Enable JIT support
 include $(LEVEL)/Makefile.common