Build more debugger/selectiondag libraries as archives instead of .o files.

This works around bugs in some versions of the cygwin linker.

Patch contributed by Anton Korobeynikov.

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

diff --git a/Makefile.rules b/Makefile.rules
index bc938d1ab19c227d075f5437b4d1b1b033d8385d..4de9228da6cb0c823e9bd8bb23cc224a88a0ae88 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -620,7 +620,7 @@ endif
 
 # What the X86 JIT requires
 ifdef ENABLE_X86_JIT
-  JIT_LIBS += LLVMX86 LLVMSelectionDAG
+  JIT_LIBS += LLVMX86 LLVMSelectionDAG.a
 endif
 
 # You can enable the PowerPC JIT on a non-PowerPC host by setting the flag
@@ -632,7 +632,7 @@ endif
 
 # What the PowerPC JIT requires
 ifdef ENABLE_PPC_JIT
-  JIT_LIBS += LLVMPowerPC LLVMSelectionDAG
+  JIT_LIBS += LLVMPowerPC LLVMSelectionDAG.a
 endif
 
 # You can enable the Alpha JIT on a non-Alpha host by setting the flag
@@ -644,7 +644,7 @@ endif
 
 # What the Alpha JIT requires
 ifdef ENABLE_ALPHA_JIT
-  JIT_LIBS += LLVMAlpha LLVMSelectionDAG
+  JIT_LIBS += LLVMAlpha LLVMSelectionDAG.a
 endif
 
 LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts.a LLVMTransformUtils.a LLVMAnalysis.a \

diff --git a/lib/CodeGen/SelectionDAG/Makefile b/lib/CodeGen/SelectionDAG/Makefile
index 73d9edb9908f56a1da6d1e511696ebdc907a9c49..306a6caad5d696e720232587ffacb51768a61856 100644 (file)
--- a/lib/CodeGen/SelectionDAG/Makefile
+++ b/lib/CodeGen/SelectionDAG/Makefile
@@ -9,5 +9,6 @@
 LEVEL = ../../..
 LIBRARYNAME = LLVMSelectionDAG
 PARALLEL_DIRS =
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Debugger/Makefile b/lib/Debugger/Makefile
index 70ee46edefc0f9620b2fa52817b4bf52ceacb321..c322064838776cedda8db19cd62b2b3296f6c205 100644 (file)
--- a/lib/Debugger/Makefile
+++ b/lib/Debugger/Makefile
@@ -11,5 +11,6 @@ LEVEL = ../..
 LIBRARYNAME = LLVMDebugger
 EXTRA_DIST = README.txt
 REQUIRES_EH := 1
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index 84689cf71839bcaef56a6fd6e12a0a47e09a4609..7bef4f2751f4075777ca8db7b0f1113a31d40239 100644 (file)
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -55,7 +55,7 @@ USEDLIBS += LLVMARM
 endif
 
 USEDLIBS += \
-       LLVMSelectionDAG \
+       LLVMSelectionDAG.a \
        LLVMCodeGen.a \
        LLVMTarget.a \
        LLVMipa.a \

diff --git a/tools/llvm-db/Makefile b/tools/llvm-db/Makefile
index e7bc95fa5da993a19cd2443f5194a76c23755733..3bf9d54afd264194f24e896ba8843e5839cde8eb 100644 (file)
--- a/tools/llvm-db/Makefile
+++ b/tools/llvm-db/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = llvm-db
-USEDLIBS = LLVMDebugger LLVMBCReader.a LLVMCore.a LLVMSupport.a \
+USEDLIBS = LLVMDebugger.a LLVMBCReader.a LLVMCore.a LLVMSupport.a \
          LLVMbzip2.a LLVMSystem.a
 REQUIRES_EH := 1