Do not link in the Sparc JIT when building on X86. Eventually the sparc will not

link in the X86 JIT either, but this makes testing easier.

For some reason, the sparc JIT was breaking the X86 JIT when it was linked in. :(

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6745 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/ExecutionEngine/Makefile b/lib/ExecutionEngine/Makefile
index 54ed699f9e1279f41e99b56e305aa3c91942fea0..7aab30577066f33ffbb0687c67db1d493d136a6d 100644 (file)
--- a/lib/ExecutionEngine/Makefile
+++ b/lib/ExecutionEngine/Makefile
@@ -2,25 +2,25 @@ LEVEL = ../..
 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.
-
 # Generic JIT libraries
 JITLIBS   = lli-jit codegen
 ARCHLIBS  =
 
 # What the X86 JIT requires
 JITLIBS  += x86
-ARCHLIBS += 
+# X86 doesn't require any ARCHLIBS
 
 # What the Sparc JIT requires
+ifeq ($(ARCH),Sparc)
 JITLIBS  += sparc 
 ARCHLIBS  = sched livevar instrument.a profpaths transformutils.a \
            bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \
            mapping select postopts.a preopts
 
-USEDLIBS = lli-interpreter $(JITLIBS) bcreader vmcore scalaropts \
-           analysis.a support.a target.a $(ARCHLIBS)
+endif
+
+USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) bcreader vmcore scalaropts.a \
+           analysis.a support.a target.a
 
 # Have gcc tell the linker to export symbols from the program so that
 # dynamically loaded modules can be linked against them.

diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index 54ed699f9e1279f41e99b56e305aa3c91942fea0..7aab30577066f33ffbb0687c67db1d493d136a6d 100644 (file)
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -2,25 +2,25 @@ LEVEL = ../..
 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.
-
 # Generic JIT libraries
 JITLIBS   = lli-jit codegen
 ARCHLIBS  =
 
 # What the X86 JIT requires
 JITLIBS  += x86
-ARCHLIBS += 
+# X86 doesn't require any ARCHLIBS
 
 # What the Sparc JIT requires
+ifeq ($(ARCH),Sparc)
 JITLIBS  += sparc 
 ARCHLIBS  = sched livevar instrument.a profpaths transformutils.a \
            bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \
            mapping select postopts.a preopts
 
-USEDLIBS = lli-interpreter $(JITLIBS) bcreader vmcore scalaropts \
-           analysis.a support.a target.a $(ARCHLIBS)
+endif
+
+USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) bcreader vmcore scalaropts.a \
+           analysis.a support.a target.a
 
 # Have gcc tell the linker to export symbols from the program so that
 # dynamically loaded modules can be linked against them.