[llvm-commits] CVS: llvm/tools/lli/Makefile

[Misha Brukman]

Changes in directory llvm/tools/lli:

Makefile updated: 1.32 -> 1.33

---
Log message:

* If compiling on X86 or Sparc, automagically enable the JIT for that arch
* Setting ENABLE_X86_JIT or ENABLE_SPARC_JIT on the `make' command-line will
  force the inclusion of that JIT on a different architecture
* If neither JIT is enabled (e.g., compiling on a different architecture), the
  -march option will not be available to LLI.
* As a side effect of the $ARCH variable, the Sparc LLI can now link just a bit
  faster by not including the x86 library.


---
Diffs of the changes:

Index: llvm/tools/lli/Makefile
diff -u llvm/tools/lli/Makefile:1.32 llvm/tools/lli/Makefile:1.33
--- llvm/tools/lli/Makefile:1.32	Mon Jun 30 16:59:00 2003
+++ llvm/tools/lli/Makefile	Wed Jul  2 12:53:14 2003
@@ -2,25 +2,41 @@
 TOOLNAME = lli
 PARALLEL_DIRS = Interpreter JIT
 
-# Get the config name...
+# Get the $(ARCH) setting
 include $(LEVEL)/Makefile.config
 
 # Generic JIT libraries
 JITLIBS   = lli-jit codegen
 ARCHLIBS  =
 
-# What the X86 JIT requires
-JITLIBS  += x86
-# X86 doesn't require any 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
+  # 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
-ifeq ($(ARCH),Sparc)
-JITLIBS  += sparc 
-ARCHLIBS  = sched livevar instrument.a profpaths \
-           bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \
-           mapping select postopts.a preopts
+ifdef ENABLE_SPARC_JIT
+  CPPFLAGS += -DENABLE_SPARC_JIT
+  JITLIBS  += sparc 
+  ARCHLIBS += sched livevar instrument.a profpaths \
+              bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \
+              mapping select postopts.a preopts
 endif
 
 USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \