Unbreak VC++ build.

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

diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp
index f961b467b7ceff6ac5b819d8acb9da6344b2f2da..1df54c56ca459a7c8b1137615d5f30a5b934be48 100644 (file)
--- a/lib/Analysis/ScalarEvolution.cpp
+++ b/lib/Analysis/ScalarEvolution.cpp
@@ -1929,7 +1929,7 @@ ComputeIterationCountExhaustively(const Loop *L, Value *Cond, bool ExitWhen) {
     // Couldn't symbolically evaluate.
     if (!CondVal) return UnknownValue;
 
-    if (CondVal->getZExtValue() == ExitWhen) {
+    if (CondVal->getZExtValue() == uint64_t(ExitWhen)) {
       ConstantEvolutionLoopExitValue[PN] = PHIVal;
       ++NumBruteForceTripCountsComputed;
       return SCEVConstant::get(ConstantInt::get(Type::Int32Ty, IterationNum));

diff --git a/win32/CBackend/CBackend.vcproj b/win32/CBackend/CBackend.vcproj
index d9333b48381613ba4aab01822cc7c5e4f002c8b8..e194126a333d582e2a3596e08dc68de9ac7e6993 100644 (file)
--- a/win32/CBackend/CBackend.vcproj
+++ b/win32/CBackend/CBackend.vcproj
@@ -109,7 +109,7 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                        <File
-                               RelativePath="..\..\lib\Target\CBackend\Writer.cpp">
+                               RelativePath="..\..\lib\Target\CBackend\CBackend.cpp">
                        </File>
                </Filter>
                <Filter

diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index f67c16177cf04db0379212253221b32fe583f2d0..43ef031348b42885cbefaac49e9e131b4cabc458 100644 (file)
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -291,6 +291,9 @@
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\RegAllocRegistry.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\CodeGen\RuntimeLibcalls.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\SchedGraphCommon.h">
                        </File>

diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj
index 7cd69e93d8deb36ea8fccd64ea61a82bd5fe5660..c9b4b5e7c9fb5ac67f5f3fe5a075af859c13cd49 100644 (file)
--- a/win32/VMCore/VMCore.vcproj
+++ b/win32/VMCore/VMCore.vcproj
@@ -290,6 +290,9 @@
                        <File
                                RelativePath="..\..\include\llvm\PassManager.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\PassManagers.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\PassSupport.h">
                        </File>

diff --git a/win32/llc/llc.vcproj b/win32/llc/llc.vcproj
index 0c5552297bc0b2be8549edb1a4290082f85657b1..2a066b88750d8dc874530fa4cac97b9e7a13e216 100644 (file)
--- a/win32/llc/llc.vcproj
+++ b/win32/llc/llc.vcproj
@@ -37,7 +37,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\Writer.obj"
+                               AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\CBackend.obj"
                                OutputFile="$(OutDir)/llc.exe"
                                LinkIncremental="2"
                                GenerateDebugInformation="TRUE"
@@ -89,7 +89,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\Writer.obj"
+                               AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\CBackend.obj"
                                OutputFile="$(OutDir)/llc.exe"
                                LinkIncremental="1"
                                GenerateDebugInformation="TRUE"