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

John Criswell criswell at choi.cs.uiuc.edu
Thu Jun 26 16:43:21 PDT 2003


Changes in directory llvm/tools/lli:

Makefile updated: 1.24.2.1 -> 1.24.2.2

---
Log message:

Merged with mainline on Thursday, June 26, 2003.


---
Diffs of the changes:

Index: llvm/tools/lli/Makefile
diff -u llvm/tools/lli/Makefile:1.24.2.1 llvm/tools/lli/Makefile:1.24.2.2
--- llvm/tools/lli/Makefile:1.24.2.1	Mon Jun 23 14:04:51 2003
+++ llvm/tools/lli/Makefile	Thu Jun 26 16:36:14 2003
@@ -2,8 +2,8 @@
 TOOLNAME = lli
 PARALLEL_DIRS = Interpreter JIT
 
-# FIXME: This enables testing the Sparc JIT on x86.
-# Perhaps in the future this should be a ./configure option.
+# Get the config name...
+include $(LEVEL)/Makefile.config
 
 # Generic JIT libraries
 JITLIBS   = lli-jit codegen
@@ -11,15 +11,24 @@
 
 # What the X86 JIT requires
 JITLIBS  += x86
-ARCHLIBS += 
+# X86 doesn't require any ARCHLIBS
+
+
 
 # What the Sparc JIT requires
+ifeq ($(OS),SunOS)
 JITLIBS  += sparc 
-ARCHLIBS  = sched livevar instrument.a profpaths transformutils.a \
+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 \
+           transformutils.a bcreader vmcore support.a target.a
 
-USEDLIBS = lli-interpreter $(JITLIBS) bcreader vmcore scalaropts \
-           analysis.a support.a target.a $(ARCHLIBS)
+# Have gcc tell the linker to export symbols from the program so that
+# dynamically loaded modules can be linked against them.
+#
+TOOLLINKOPTS = $(PLATFORMLIBDL)
 
 include $(LEVEL)/Makefile.common





More information about the llvm-commits mailing list