diff options
| author | Chris Lattner <sabre@nondot.org> | 2003-06-17 15:54:52 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2003-06-17 15:54:52 +0000 |
| commit | 2bf4c615572c202bdc66f58812ddd328041ad615 (patch) | |
| tree | e254a64a3b706c99622a501a2a100edec0b9a98c | |
| parent | de3209bfdbb5b26198af8e6f30684bc50eb39ab6 (diff) | |
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
| -rw-r--r-- | lib/ExecutionEngine/Makefile | 12 | ||||
| -rw-r--r-- | tools/lli/Makefile | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/lib/ExecutionEngine/Makefile b/lib/ExecutionEngine/Makefile index 54ed699f9e..7aab305770 100644 --- 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 54ed699f9e..7aab305770 100644 --- 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. |