1. Remove libraries no longer created from the list of libraries linked into the

   SparcV9 JIT.
2. Make LLVMTransformUtils a relinked object file and always link it before
   LLVMAnalysis.a.  These two libraries have circular dependencies on each
   other which creates problem when building the SparcV9 JIT.  This change
   fixes the dependency on all platforms problems with a minimum of fuss.

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

diff --git a/Makefile.rules b/Makefile.rules
index 156354b2a72958ff93595ed365428d7a51dc7066..04f3660a1ab0c6b755850596e93810ae917b40c6 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -588,9 +588,9 @@ endif
 # What the Sparc JIT requires
 ifdef ENABLE_SPARCV9_JIT
   JIT_LIBS += LLVMSparcV9 LLVMSparcV9ModuloSched LLVMSparcV9InstrSched \
-              LLVMSparcV9LiveVar LLVMInstrumentation.a LLVMProfilePaths \
+              LLVMSparcV9LiveVar LLVMInstrumentation.a \
               LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \
-              LLVMDataStructure.a LLVMSparcV9RegAlloc
+              LLVMDataStructure LLVMSparcV9RegAlloc
 endif
 
 # You can enable the PowerPC JIT on a non-PowerPC host by setting the flag
@@ -617,7 +617,7 @@ ifdef ENABLE_ALPHA_JIT
   JIT_LIBS += LLVMAlpha LLVMSelectionDAG
 endif
 
-LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts.a LLVMTransformUtils.a LLVMAnalysis.a \
+LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts.a LLVMTransformUtils LLVMAnalysis.a \
             LLVMBCReader LLVMCore LLVMSupport.a LLVMTarget.a LLVMbzip2 \
             LLVMSystem.a $(PLATFORMLIBDL)
 endif

diff --git a/lib/Transforms/Utils/Makefile b/lib/Transforms/Utils/Makefile
index 26fc4261f161e4ee0b296a8b3c73c0bea10ca9fe..a0c49bd9dfe85c8f16b1dc13d42551acc778ccd7 100644 (file)
--- a/lib/Transforms/Utils/Makefile
+++ b/lib/Transforms/Utils/Makefile
@@ -9,7 +9,6 @@
 
 LEVEL = ../../..
 LIBRARYNAME = LLVMTransformUtils
-BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
 

diff --git a/tools/analyze/Makefile b/tools/analyze/Makefile
index 06def88d01a0982f55fb94b99161ae50a77f8234..0d1c2485eba575d3d57c516f74fc604cb68b2184 100644 (file)
--- a/tools/analyze/Makefile
+++ b/tools/analyze/Makefile
@@ -11,6 +11,6 @@ TOOLNAME = analyze
 USEDLIBS = LLVMAsmParser LLVMBCReader LLVMAnalysis.a LLVMipa.a \
            LLVMDataStructure \
           LLVMScalarOpts.a LLVMTransforms.a LLVMTarget.a LLVMScalarOpts.a \
-          LLVMTransformUtils.a LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+          LLVMTransformUtils LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/bugpoint/Makefile b/tools/bugpoint/Makefile
index 6460aa82aa2a44dc32f365b0f0a1f75d94244dff..0b198323afeefb010b04aa23f446f4453a39430a 100644 (file)
--- a/tools/bugpoint/Makefile
+++ b/tools/bugpoint/Makefile
@@ -14,7 +14,7 @@ OPTLIBS  = LLVMTransforms.a LLVMInstrumentation.a
 ANALIBS  = LLVMDataStructure LLVMipa.a LLVMTarget.a 
 
 USEDLIBS = LLVMipo.a LLVMScalarOpts.a $(OPTLIBS) $(ANALIBS) LLVMAnalysis.a \
-          LLVMTransformUtils.a \
+          LLVMTransformUtils \
           LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \
           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
 

diff --git a/tools/gccas/Makefile b/tools/gccas/Makefile
index 32c10c88658d2408d257d8e54e19166b36814976..8359a760810f68ef2108cb47c9104ce59ad865ca 100644 (file)
--- a/tools/gccas/Makefile
+++ b/tools/gccas/Makefile
@@ -10,7 +10,7 @@ LEVEL = ../..
 
 TOOLNAME = gccas
 USEDLIBS = LLVMAsmParser LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \
-           LLVMScalarOpts.a LLVMAnalysis.a LLVMTarget.a LLVMTransformUtils.a \
+           LLVMScalarOpts.a LLVMAnalysis.a LLVMTarget.a LLVMTransformUtils \
            LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/gccld/Makefile b/tools/gccld/Makefile
index 96e73d6871363364e2ef5878509899d7be8ff6dc..e55a85e8f6763ba5926cf88ac8b836c60530c217 100644 (file)
--- a/tools/gccld/Makefile
+++ b/tools/gccld/Makefile
@@ -11,7 +11,7 @@ LEVEL = ../..
 
 TOOLNAME = gccld
 USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
-           LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
+           LLVMipa.a LLVMTransformUtils LLVMTarget.a LLVMLinker.a \
            LLVMArchive.a LLVMBCReader LLVMBCWriter \
            LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
 

diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index 031012a8e58bda7a137a9e1cc3411b95c0c3742f..ef21140a137b4ebfd88cfa9a89867d46aa06b33e 100644 (file)
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -70,7 +70,7 @@ USEDLIBS += \
        LLVMipa.a \
        LLVMTransforms.a \
        LLVMScalarOpts.a \
-       LLVMTransformUtils.a \
+       LLVMTransformUtils \
        LLVMAnalysis.a \
        LLVMBCReader \
        LLVMBCWriter \

diff --git a/tools/llvm-extract/Makefile b/tools/llvm-extract/Makefile
index 80a90fa41a887eb60b1bd0cb5d8946a7b9480100..69e7e7f92795b2e37c984584901b38b00b9fcd5e 100644 (file)
--- a/tools/llvm-extract/Makefile
+++ b/tools/llvm-extract/Makefile
@@ -10,7 +10,7 @@ LEVEL = ../..
 
 TOOLNAME = llvm-extract
 USEDLIBS = LLVMBCReader LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMTarget.a \
-           LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a \
+           LLVMAnalysis.a LLVMTransformUtils LLVMipa.a \
            LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-ld/Makefile b/tools/llvm-ld/Makefile
index 34d6dc69ca4690e9a8a8fe84ec1c09a30963fd6d..880df9f4fc676a78c925b93ca514cf480d97b6bb 100644 (file)
--- a/tools/llvm-ld/Makefile
+++ b/tools/llvm-ld/Makefile
@@ -11,7 +11,7 @@ LEVEL = ../..
 
 TOOLNAME = llvm-ld
 USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
-          LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
+          LLVMipa.a LLVMTransformUtils LLVMTarget.a LLVMLinker.a \
           LLVMArchive.a LLVMBCReader LLVMBCWriter \
           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
 

diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index 4fd8293eb0319589f26e8c02680867810daeab0a..fcc6c5fc5dff758aedbfa6e604ecba8f75344c7d 100644 (file)
--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@@ -11,7 +11,7 @@ TOOLNAME = opt
 
 USEDLIBS = LLVMBCReader LLVMBCWriter LLVMInstrumentation.a \
           LLVMScalarOpts.a LLVMipo.a LLVMipa.a LLVMDataStructure LLVMTransforms.a \
-          LLVMTarget.a LLVMAnalysis.a LLVMTransformUtils.a LLVMCore LLVMSupport.a \
+          LLVMTarget.a LLVMAnalysis.a LLVMTransformUtils LLVMCore LLVMSupport.a \
           LLVMbzip2 LLVMSystem.a 
 
 include $(LEVEL)/Makefile.common