Add CondPropagate.cpp to VC++ Transforms project

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index b020ca9a11dab790e4bdedfac8b17a75d1a7fb5e..5fd539daaa7c6f07bfc0dd2d7481677463da483e 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -275,6 +275,9 @@ endif
 ifndef LLI
 LLI      := $(LLVMToolDir)/lli$(EXEEXT)
 endif
+ifndef LLC
+LLC      := $(LLVMToolDir)/llc$(EXEEXT)
+endif
 ifndef LOPT
 LOPT     := $(LLVMToolDir)/opt$(EXEEXT)
 endif
@@ -322,7 +325,7 @@ endif
 ifndef KEEP_SYMBOLS
   Strip := $(PLATFORMSTRIPOPTS)
   StripWarnMsg := "(without symbols)"
-  Install.Flags += -s
+  Install.StripFlag += -s
 endif
 
 # Adjust linker flags for building an executable
@@ -362,8 +365,8 @@ Relink        = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
                 $(CompileCommonOpts)
 LTInstall     = $(LIBTOOL) $(LibTool.Flags) --mode=install $(INSTALL) \
                $(Install.Flags)
-ProgInstall   = $(INSTALL) $(Install.Flags) -m 0755 
-DataInstall   = $(INSTALL) $(Install.Flags) -m 0644
+ProgInstall   = $(INSTALL) $(Install.StripFlag) -m 0755 
+DataInstall   = $(INSTALL) -m 0644
 Burg          = $(BURG) -I $(PROJ_SRC_DIR)
 TableGen      = $(TBLGEN) -I $(PROJ_SRC_DIR)
 Archive       = $(AR) $(AR.Flags)
@@ -594,7 +597,7 @@ install-local:: $(DestModule)
 
 $(DestModule): $(ModuleDestDir) $(Module) 
        $(Echo) Installing $(BuildMode) Bytecode Module $(DestModule)
-       $(Verb) $(ProgInstall) $(Module) $(DestModule)
+       $(Verb) $(DataInstall) $(Module) $(DestModule)
 
 uninstall-local::
        $(Echo) Uninstalling $(BuildMode) Bytecode Module $(DestModule)
@@ -708,7 +711,7 @@ install-local:: $(DestBytecodeLib)
 
 $(DestBytecodeLib): $(BytecodeDestDir) $(LibName.BCA) 
        $(Echo) Installing $(BuildMode) Bytecode Archive $(DestBytecodeLib)
-       $(Verb) $(ProgInstall) $(LibName.BCA) $(DestBytecodeLib)
+       $(Verb) $(DataInstall) $(LibName.BCA) $(DestBytecodeLib)
 
 uninstall-local::
        $(Echo) Uninstalling $(BuildMode) Bytecode Archive $(DestBytecodeLib)
@@ -815,7 +818,7 @@ endif
 
 # What the X86 JIT requires
 ifdef ENABLE_X86_JIT
-  JIT_LIBS  += LLVMX86 LLVMSelectionDAG
+  JIT_LIBS += LLVMX86 LLVMSelectionDAG
 endif
 
 # You can enable the SparcV9 JIT on a non-SparcV9 host by setting the flag
@@ -829,8 +832,8 @@ endif
 ifdef ENABLE_SPARCV9_JIT
   JIT_LIBS += LLVMSparcV9 LLVMSparcV9ModuloSched LLVMSparcV9InstrSched \
               LLVMSparcV9LiveVar LLVMInstrumentation.a LLVMProfilePaths \
-             LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \
-             LLVMDataStructure.a LLVMSparcV9RegAlloc
+              LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \
+              LLVMDataStructure.a LLVMSparcV9RegAlloc
 endif
 
 # You can enable the PowerPC JIT on a non-PowerPC host by setting the flag
@@ -842,12 +845,12 @@ endif
 
 # What the PowerPC JIT requires
 ifdef ENABLE_PPC_JIT
-  JIT_LIBS  += LLVMPowerPC
+  JIT_LIBS += LLVMPowerPC LLVMSelectionDAG
 endif
 
 LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts LLVMAnalysis.a LLVMTransformUtils.a \
-             LLVMBCReader LLVMCore LLVMSupport.a LLVMTarget.a LLVMbzip2 \
-            LLVMSystem.a $(PLATFORMLIBDL)
+            LLVMBCReader LLVMCore LLVMSupport.a LLVMTarget.a LLVMbzip2 \
+            LLVMSystem.a $(PLATFORMLIBDL)
 endif
 
 #---------------------------------------------------------
@@ -1525,7 +1528,7 @@ printvars::
        $(Echo) "TDFiles      : " '$(TDFiles)'
        $(Echo) "INCFiles     : " '$(INCFiles)'
        $(Echo) "INCTMPFiles  : " '$(INCTMPFiles)'
-       $(Echo) "Preconditions: " '$(Preconditions)'
+       $(Echo) "PreConditions: " '$(PreConditions)'
        $(Echo) "Compile.CXX  : " '$(Compile.CXX)'
        $(Echo) "Compile.C    : " '$(Compile.C)'
        $(Echo) "Archive      : " '$(Archive)'