Unbreak VC++ build.

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

diff --git a/include/llvm/ADT/SmallVector.h b/include/llvm/ADT/SmallVector.h
index b5ee6c454b3088e0b6e04b07963dfbad15bef357..9f2842a63890c960b716b2afebc41544f2e8824b 100644 (file)
--- a/include/llvm/ADT/SmallVector.h
+++ b/include/llvm/ADT/SmallVector.h
@@ -18,6 +18,25 @@
 #include <iterator>
 #include <memory>
 
+#ifdef _MSC_VER
+namespace std {
+  // Fix bug in VC++ implementation of std::uninitialized_copy.  Define
+  // additional overloads so that the copy is recognized as a scalar and
+  // not an object copy.
+  template<class T1, class T2>
+  inline _Scalar_ptr_iterator_tag _Ptr_cat(T1 **, T2 **) {
+         _Scalar_ptr_iterator_tag _Cat;
+         return _Cat;
+  }
+
+  template<class T1, class T2>
+  inline _Scalar_ptr_iterator_tag _Ptr_cat(T1* const *, T2 **) {
+         _Scalar_ptr_iterator_tag _Cat;
+         return _Cat;
+  }
+}
+#endif
+
 namespace llvm {
 
 /// SmallVectorImpl - This class consists of common code factored out of the

diff --git a/include/llvm/Analysis/ScalarEvolution.h b/include/llvm/Analysis/ScalarEvolution.h
index b950ca48c6409ddd21683ac30124663567259b28..27d7e04a3e25cc042ce2624b3ea9d893f9b6aa73 100644 (file)
--- a/include/llvm/Analysis/ScalarEvolution.h
+++ b/include/llvm/Analysis/ScalarEvolution.h
@@ -22,6 +22,7 @@
 #define LLVM_ANALYSIS_SCALAREVOLUTION_H
 
 #include "llvm/Pass.h"
+#include "llvm/Support/DataTypes.h"
 #include "llvm/Support/Streams.h"
 #include <set>
 

diff --git a/include/llvm/Support/MathExtras.h b/include/llvm/Support/MathExtras.h
index f0bc91f8d0a8e41439c365a3ff6216144dcff17c..41833438078ce7ffc3f2222090bb746c9fc0633d 100644 (file)
--- a/include/llvm/Support/MathExtras.h
+++ b/include/llvm/Support/MathExtras.h
@@ -255,7 +255,7 @@ inline unsigned CountPopulation_64(uint64_t Value) {
   uint64_t v = Value - ((Value >> 1) & 0x5555555555555555ULL);
   v = (v & 0x3333333333333333ULL) + ((v >> 2) & 0x3333333333333333ULL);
   v = (v + (v >> 4)) & 0x0F0F0F0F0F0F0F0FULL;
-  return (uint64_t)(v * 0x0101010101010101ULL) >> 56;
+  return unsigned((uint64_t)(v * 0x0101010101010101ULL) >> 56);
 #endif
 }
 

diff --git a/lib/Analysis/ConstantFolding.cpp b/lib/Analysis/ConstantFolding.cpp
index 01aedda63538dd60163020f17c79bf81b28df84e..1288674139cc8f743031c9fac34c524d4b3b22de 100644 (file)
--- a/lib/Analysis/ConstantFolding.cpp
+++ b/lib/Analysis/ConstantFolding.cpp
@@ -72,8 +72,8 @@ static bool IsConstantOffsetFromGlobal(Constant *C, GlobalValue *&GV,
         // N = N + Offset
         Offset += TD.getStructLayout(ST)->getElementOffset(CI->getZExtValue());
       } else {
-        const SequentialType *ST = cast<SequentialType>(*GTI);
-        Offset += TD.getTypeSize(ST->getElementType())*CI->getSExtValue();
+        const SequentialType *SQT = cast<SequentialType>(*GTI);
+        Offset += TD.getTypeSize(SQT->getElementType())*CI->getSExtValue();
       }
     }
     return true;

diff --git a/lib/Analysis/IPA/Andersens.cpp b/lib/Analysis/IPA/Andersens.cpp
index 52b19194e1b0daae44b929f1218cb02b675802f4..0a281c89458325f5df60af05f5cacc7f16757919 100644 (file)
--- a/lib/Analysis/IPA/Andersens.cpp
+++ b/lib/Analysis/IPA/Andersens.cpp
@@ -62,6 +62,7 @@
 #include "llvm/Analysis/Passes.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/ADT/Statistic.h"
+#include <algorithm>
 #include <set>
 using namespace llvm;
 

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index afaf7826f68b0e958ca3361486726bf4b95480a5..27890e95be90e83ef21b3c034fd9e313bc269e66 100644 (file)
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -3301,7 +3301,7 @@ TargetLowering::LowerCallTo(SDOperand Chain, const Type *RetTy,
     // Flags[2] -> isSRet
     // Flags[1] -> isInReg
     // Flags[0] -> isSigned
-    unsigned Flags = (isSRet << 2) | (isInReg << 1) | isSigned |
+    unsigned Flags = (isSRet << 2) | (isInReg << 1) | unsigned(isSigned) |
       (OriginalAlignment << 27);
 
     switch (getTypeAction(VT)) {

diff --git a/lib/Support/APInt.cpp b/lib/Support/APInt.cpp
index 683211b451bb17f13c3c285c001f5711c9d870eb..08ec2362007bb054d6970c1fc268814fe57b717c 100644 (file)
--- a/lib/Support/APInt.cpp
+++ b/lib/Support/APInt.cpp
@@ -17,6 +17,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/MathExtras.h"
+#include <math.h>
 #include <cstring>
 #include <cstdlib>
 #ifndef NDEBUG
@@ -1224,9 +1225,16 @@ APInt APInt::sqrt() const {
   // an IEEE double precision floating point value), then we can use the
   // libc sqrt function which will probably use a hardware sqrt computation.
   // This should be faster than the algorithm below.
-  if (magnitude < 52)
+  if (magnitude < 52) {
+#ifdef _MSC_VER
+    // Amazingly, VC++ doesn't have round().
+    return APInt(BitWidth, 
+                 uint64_t(::sqrt(double(isSingleWord()?VAL:pVal[0]))) + 0.5);
+#else
     return APInt(BitWidth, 
                  uint64_t(::round(::sqrt(double(isSingleWord()?VAL:pVal[0])))));
+#endif
+  }
 
   // Okay, all the short cuts are exhausted. We must compute it. The following
   // is a classical Babylonian method for computing the square root. This code

diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp
index dfa6d2a283a20fcaa899c1091eb8f745f19b90c0..b1f08079f0e84e577bf68254dfe62e6eb2287c2c 100644 (file)
--- a/lib/Target/TargetData.cpp
+++ b/lib/Target/TargetData.cpp
@@ -400,7 +400,7 @@ uint64_t TargetData::getTypeSize(const Type *Ty) const {
     unsigned char Alignment;
     Size = getTypeSize(ATy->getElementType());
     Alignment = getABITypeAlignment(ATy->getElementType());
-    unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
+    uint64_t AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
     return AlignedSize*ATy->getNumElements();
   }
   case Type::StructTyID: {

diff --git a/lib/Transforms/IPO/RaiseAllocations.cpp b/lib/Transforms/IPO/RaiseAllocations.cpp
index aeb41738419c4a9874e7bf1ecb1059485ff81004..ce6db5624a08975ad40d0e4c9b4ab5178a4d68c6 100644 (file)
--- a/lib/Transforms/IPO/RaiseAllocations.cpp
+++ b/lib/Transforms/IPO/RaiseAllocations.cpp
@@ -22,6 +22,7 @@
 #include "llvm/Support/CallSite.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/ADT/Statistic.h"
+#include <algorithm>
 using namespace llvm;
 
 STATISTIC(NumRaised, "Number of allocations raised");

diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index 2a08ced68c85e307e4d0cb695a5dddbb5fd8fa25..e8dbb73a88f471882dae3f9f8ea6ecdcf03ccdc6 100644 (file)
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -7663,6 +7663,7 @@ Instruction *InstCombiner::FoldPHIArgOpIntoPHI(PHINode &PN) {
                            PhiVal, ConstantOp);
   else
     assert(0 && "Unknown operation");
+  return 0;
 }
 
 /// DeadPHICycle - Return true if this PHI node is only used by a PHI node cycle

diff --git a/lib/Transforms/Scalar/PredicateSimplifier.cpp b/lib/Transforms/Scalar/PredicateSimplifier.cpp
index b425a8c31323066ced962d8a65af594839b21071..324cbc68daeb16feb5baa829c19a68d8c8e00bfe 100644 (file)
--- a/lib/Transforms/Scalar/PredicateSimplifier.cpp
+++ b/lib/Transforms/Scalar/PredicateSimplifier.cpp
@@ -421,7 +421,7 @@ namespace {
           iSGT = iUGT;
           iSLT = iULT;
         } else {
-          assert(iULT->first->getValue().isPositive() >= 0 &&
+          assert(iULT->first->getValue().isPositive() &&
                  iUGT->first->getValue().isNegative() &&"Bad sign comparison.");
           iSGT = iULT;
           iSLT = iUGT;

diff --git a/lib/VMCore/Pass.cpp b/lib/VMCore/Pass.cpp
index 2e27015c3ac37aaf40566537e4868a3d5f2bb0c8..b593d475ca0efe3119cb0edf5b5779d1f57a4de4 100644 (file)
--- a/lib/VMCore/Pass.cpp
+++ b/lib/VMCore/Pass.cpp
@@ -19,6 +19,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/TypeInfo.h"
+#include <algorithm>
 #include <set>
 using namespace llvm;
 

diff --git a/lib/VMCore/PassManager.cpp b/lib/VMCore/PassManager.cpp
index a2bbb7d3ab9be167ffdbce79e9bef2d52d439a07..470428f17b0da8c99fcff273db23b46f020437f4 100644 (file)
--- a/lib/VMCore/PassManager.cpp
+++ b/lib/VMCore/PassManager.cpp
@@ -19,6 +19,7 @@
 #include "llvm/ModuleProvider.h"
 #include "llvm/Support/Streams.h"
 #include "llvm/Support/ManagedStatic.h"
+#include <algorithm>
 #include <vector>
 #include <map>
 

diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp
index 4c76b2b5532c528832803784aef09769887a1e17..8bc99a8590bf3bab560052b053308142af798c9e 100644 (file)
--- a/lib/VMCore/Value.cpp
+++ b/lib/VMCore/Value.cpp
@@ -128,7 +128,7 @@ void Value::setName(const char *Name) {
 
 void Value::setName(const char *NameStr, unsigned NameLen) {
   if (NameLen == 0 && !hasName()) return;
-  if (getType() != Type::VoidTy && "Cannot assign a name to void values!");
+  assert(getType() != Type::VoidTy && "Cannot assign a name to void values!");
   
   // Get the symbol table to update for this object.
   ValueSymbolTable *ST;

diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp
index 49f662d7453c46ab2bc93f362340f95c36f3f5d6..bad001e408709bbb1432538c1185f380d8f54d4e 100644 (file)
--- a/tools/llvm-nm/llvm-nm.cpp
+++ b/tools/llvm-nm/llvm-nm.cpp
@@ -22,6 +22,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/System/Signals.h"
+#include <algorithm>
 #include <cctype>
 #include <cerrno>
 #include <cstring>

diff --git a/tools/llvm-prof/llvm-prof.cpp b/tools/llvm-prof/llvm-prof.cpp
index b0767e6fdf3066b85fa36f8d99a7b925825ef3ad..6b1d514bcd6e07bf557e1926a39cbd24454f757c 100644 (file)
--- a/tools/llvm-prof/llvm-prof.cpp
+++ b/tools/llvm-prof/llvm-prof.cpp
@@ -21,6 +21,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/System/Signals.h"
+#include <algorithm>
 #include <iostream>
 #include <iomanip>
 #include <map>

diff --git a/win32/Analysis/Analysis.vcproj b/win32/Analysis/Analysis.vcproj
index d2241392e7ead56f3d7f86676bbdba1a0f93f34d..56befeac4038b286697ae451f4b14d47fcd6c4fd 100644 (file)
--- a/win32/Analysis/Analysis.vcproj
+++ b/win32/Analysis/Analysis.vcproj
@@ -132,9 +132,6 @@
                        <File
                                RelativePath="..\..\lib\Analysis\ConstantFolding.cpp">
                        </File>
-                       <File
-                               RelativePath="..\..\lib\Analysis\ConstantRange.cpp">
-                       </File>
                        <File
                                RelativePath="..\..\lib\Analysis\InstCount.cpp">
                        </File>
@@ -150,6 +147,9 @@
                        <File
                                RelativePath="..\..\lib\Analysis\LoopInfo.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\lib\Analysis\LoopPass.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\lib\Analysis\PostDominators.cpp">
                        </File>
@@ -240,6 +240,9 @@
                        <File
                                RelativePath="..\..\include\llvm\Analysis\LoopInfo.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\Analysis\LoopPass.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\Analysis\Passes.h">
                        </File>

diff --git a/win32/Bytecode/Bytecode.vcproj b/win32/Bytecode/Bytecode.vcproj
index b962f1a950041a8b7452fe102d2a36b7bbf2396a..d0980b992f4cef408c65ae19ebe2ec4110f94dd2 100644 (file)
--- a/win32/Bytecode/Bytecode.vcproj
+++ b/win32/Bytecode/Bytecode.vcproj
@@ -133,9 +133,6 @@
                                <File
                                        RelativePath="..\..\lib\Bytecode\Writer\SlotCalculator.h">
                                </File>
-                               <File
-                                       RelativePath="..\..\lib\Bytecode\Writer\SlotTable.h">
-                               </File>
                                <File
                                        RelativePath="..\..\lib\Bytecode\Writer\Writer.cpp">
                                </File>

diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index 43ef031348b42885cbefaac49e9e131b4cabc458..3486f79d81866af236ca492f6d2c6a7be2bb1bc9 100644 (file)
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -120,6 +120,9 @@
                        <File
                                RelativePath="..\..\lib\CodeGen\ELFWriter.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\ELFWriter.h">
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\IntrinsicLowering.cpp">
                        </File>
@@ -138,18 +141,24 @@
                        <File
                                RelativePath="..\..\lib\CodeGen\MachineBasicBlock.cpp">
                        </File>
-                       <File
-                               RelativePath="..\..\lib\CodeGen\MachineDebugInfo.cpp">
-                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\MachineFunction.cpp">
                        </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\MachineInstr.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\MachineModuleInfo.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\MachinePassRegistry.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\MachOWriter.cpp">
+                       </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\MachOWriter.h">
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\Passes.cpp">
                        </File>
@@ -168,6 +177,9 @@
                        <File
                                RelativePath="..\..\lib\CodeGen\RegAllocSimple.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\RegisterScavenging.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\TwoAddressInstructionPass.cpp">
                        </File>
@@ -180,6 +192,9 @@
                        <Filter
                                Name="SelectionDAG"
                                Filter="">
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\CallingConvLower.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\lib\CodeGen\SelectionDAG\DAGCombiner.cpp">
                                </File>
@@ -219,11 +234,14 @@
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\AsmPrinter.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\CodeGen\CallingConvLower.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\DwarfWriter.h">
                        </File>
                        <File
-                               RelativePath="..\..\include\llvm\CodeGen\ELFWriter.h">
+                               RelativePath="..\..\include\llvm\CodeGen\FileWriters.h">
                        </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\InstrScheduling.h">
@@ -273,6 +291,9 @@
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\MachineLocation.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\CodeGen\MachineModuleInfo.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\MachinePassRegistry.h">
                        </File>
@@ -280,7 +301,7 @@
                                RelativePath="..\..\include\llvm\CodeGen\MachineRelocation.h">
                        </File>
                        <File
-                               RelativePath="..\..\include\llvm\CodeGen\MachOWriter.h">
+                               RelativePath="..\..\include\llvm\CodeGen\MachORelocation.h">
                        </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\Passes.h">
@@ -291,6 +312,9 @@
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\RegAllocRegistry.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\CodeGen\RegisterScavenging.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\RuntimeLibcalls.h">
                        </File>

diff --git a/win32/Support/Support.vcproj b/win32/Support/Support.vcproj
index 613bb0f3de4b5577994fc66a9e1a446f7b1d03b1..56e98d2351e04cb9f197adcd532398d3dc5f63ab 100644 (file)
--- a/win32/Support/Support.vcproj
+++ b/win32/Support/Support.vcproj
@@ -115,6 +115,9 @@
                        <File
                                RelativePath="..\..\lib\Support\Annotation.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\lib\Support\APInt.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\lib\Support\CommandLine.cpp">
                        </File>
@@ -128,7 +131,7 @@
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\lib\Support\CStringMap.cpp">
+                               RelativePath="..\..\lib\Support\ConstantRange.cpp">
                        </File>
                        <File
                                RelativePath="..\..\lib\Support\Debug.cpp">
@@ -172,6 +175,9 @@
                                                Name="VCCLCompilerTool"/>
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="..\..\lib\Support\SmallPtrSet.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\lib\Support\Statistic.cpp">
                        </File>
@@ -181,6 +187,9 @@
                        <File
                                RelativePath="..\..\lib\Support\StringExtras.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\lib\Support\StringMap.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\lib\Support\SystemUtils.cpp">
                        </File>
@@ -301,6 +310,9 @@
                        <File
                                RelativePath="..\..\include\llvm\Support\MathExtras.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\Support\OutputBuffer.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\Support\PassNameParser.h">
                        </File>
@@ -342,10 +354,10 @@
                        Name="ADT"
                        Filter="">
                        <File
-                               RelativePath="..\..\include\llvm\Adt\BitSetVector.h">
+                               RelativePath="..\..\include\llvm\ADT\APInt.h">
                        </File>
                        <File
-                               RelativePath="..\..\include\llvm\ADT\CStringMap.h">
+                               RelativePath="..\..\include\llvm\ADT\BitVector.h">
                        </File>
                        <File
                                RelativePath="..\..\include\llvm\Adt\DenseMap.h">
@@ -374,6 +386,9 @@
                        <File
                                RelativePath="..\..\include\llvm\Adt\ilist">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\ADT\IndexedMap.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\Adt\iterator">
                        </File>
@@ -389,6 +404,12 @@
                        <File
                                RelativePath="..\..\include\llvm\Adt\SetVector.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\ADT\SmallPtrSet.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\llvm\ADT\SmallSet.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\ADT\SmallString.h">
                        </File>
@@ -404,6 +425,9 @@
                        <File
                                RelativePath="..\..\include\llvm\Adt\StringExtras.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\ADT\StringMap.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\Adt\Tree.h">
                        </File>

diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj
index 1286da3059a206cece0c3bc4b25376abf51d619b..e5cb3e8c98212075b884be21d0480abf86030f8f 100644 (file)
--- a/win32/System/System.vcproj
+++ b/win32/System/System.vcproj
@@ -112,6 +112,9 @@
                        <File
                                RelativePath="..\..\lib\System\Alarm.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\lib\System\Disassembler.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\lib\System\DynamicLibrary.cpp">
                        </File>
@@ -150,6 +153,9 @@
                        <File
                                RelativePath="..\..\include\llvm\System\Alarm.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\System\Disassembler.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\System\DynamicLibrary.h">
                        </File>

diff --git a/win32/TableGen/TableGen.vcproj b/win32/TableGen/TableGen.vcproj
index e0a02b7e2eba5167a572fe1a093e524a46ab83b4..407da445789cc05eb04d88aac8cbe182734ab7e5 100644 (file)
--- a/win32/TableGen/TableGen.vcproj
+++ b/win32/TableGen/TableGen.vcproj
@@ -128,6 +128,9 @@
                        <File
                                RelativePath="..\..\utils\TableGen\AsmWriterEmitter.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\utils\TableGen\CallingConvEmitter.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\utils\TableGen\CodeEmitterGen.cpp">
                        </File>
@@ -208,6 +211,9 @@
                        <File
                                RelativePath="..\..\utils\TableGen\AsmWriterEmitter.h">
                        </File>
+                       <File
+                               RelativePath="..\..\utils\TableGen\CallingConvEmitter.h">
+                       </File>
                        <File
                                RelativePath="..\..\utils\TableGen\CodeEmitterGen.h">
                        </File>

diff --git a/win32/Target/Target.vcproj b/win32/Target/Target.vcproj
index 36d5ec92eb51408a3b0574632f195189849accc9..da5f87fbe8f3c0090d85bf1e89dbe457fe88b681 100644 (file)
--- a/win32/Target/Target.vcproj
+++ b/win32/Target/Target.vcproj
@@ -132,6 +132,9 @@
                        <File
                                RelativePath="..\..\lib\Target\TargetMachineRegistry.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\lib\Target\TargetMachOWriterInfo.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\lib\Target\TargetSubtarget.cpp">
                        </File>
@@ -152,6 +155,9 @@
                        <File
                                RelativePath="..\..\include\llvm\Target\TargetData.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\Target\TargetELFWriterInfo.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\Target\TargetFrameInfo.h">
                        </File>
@@ -173,6 +179,9 @@
                        <File
                                RelativePath="..\..\include\llvm\Target\TargetMachineRegistry.h">
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\Target\TargetMachOWriterInfo.h">
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\Target\TargetOptions.h">
                        </File>

diff --git a/win32/Transforms/Transforms.vcproj b/win32/Transforms/Transforms.vcproj
index e1856daac1cd5937a8141bf65c7a36fbc6527014..f756c6222e14685ca9f0ac051284ac16c81dcf62 100644 (file)
--- a/win32/Transforms/Transforms.vcproj
+++ b/win32/Transforms/Transforms.vcproj
@@ -108,18 +108,6 @@
                        Name="Source Files"
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-                       <File
-                               RelativePath="..\..\lib\Transforms\ExprTypeConvert.cpp">
-                       </File>
-                       <File
-                               RelativePath="..\..\lib\Transforms\LevelRaise.cpp">
-                       </File>
-                       <File
-                               RelativePath="..\..\lib\Transforms\TransformInternals.cpp">
-                       </File>
-                       <File
-                               RelativePath="..\..\lib\Transforms\TransformInternals.h">
-                       </File>
                        <Filter
                                Name="Instrumentation"
                                Filter="">
@@ -129,9 +117,6 @@
                                <File
                                        RelativePath="..\..\lib\Transforms\Instrumentation\EdgeProfiling.cpp">
                                </File>
-                               <File
-                                       RelativePath="..\..\lib\Transforms\Instrumentation\EmitFunctions.cpp">
-                               </File>
                                <File
                                        RelativePath="..\..\lib\Transforms\Instrumentation\ProfilingUtils.cpp">
                                </File>
@@ -144,9 +129,6 @@
                                <File
                                        RelativePath="..\..\lib\Transforms\Instrumentation\RSProfiling.h">
                                </File>
-                               <File
-                                       RelativePath="..\..\lib\Transforms\Instrumentation\TraceBasicBlocks.cpp">
-                               </File>
                        </Filter>
                        <Filter
                                Name="IPO"
@@ -166,9 +148,6 @@
                                <File
                                        RelativePath="..\..\lib\Transforms\Ipo\ExtractFunction.cpp">
                                </File>
-                               <File
-                                       RelativePath="..\..\lib\Transforms\Ipo\FunctionResolution.cpp">
-                               </File>
                                <File
                                        RelativePath="..\..\lib\Transforms\Ipo\GlobalDCE.cpp">
                                </File>
@@ -208,6 +187,9 @@
                                <File
                                        RelativePath="..\..\lib\Transforms\Ipo\SimplifyLibCalls.cpp">
                                </File>
+                               <File
+                                       RelativePath="..\..\lib\Transforms\IPO\StripDeadPrototypes.cpp">
+                               </File>
                                <File
                                        RelativePath="..\..\lib\Transforms\Ipo\StripSymbols.cpp">
                                </File>

diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj
index c9b4b5e7c9fb5ac67f5f3fe5a075af859c13cd49..9ccf289032fc2c184805d2ed03501a3f960cec81 100644 (file)
--- a/win32/VMCore/VMCore.vcproj
+++ b/win32/VMCore/VMCore.vcproj
@@ -116,7 +116,7 @@
                                RelativePath="..\..\lib\VMCore\BasicBlock.cpp">
                        </File>
                        <File
-                               RelativePath="..\..\lib\VMCore\ConstantFolding.cpp">
+                               RelativePath="..\..\lib\VMCore\ConstantFold.cpp">
                        </File>
                        <File
                                RelativePath="..\..\lib\VMCore\Constants.cpp">
@@ -149,7 +149,8 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Performing TableGen Step"
-                                               CommandLine="..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
+                                               CommandLine="echo Building $(InputFileName) code emitter with tblgen
+..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
 "
                                                AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
                                                Outputs="$(SolutionDir)llvm\intrinsics.gen"/>
@@ -159,7 +160,8 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Performing TableGen Step"
-                                               CommandLine="..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
+                                               CommandLine="echo Building $(InputFileName) code emitter with tblgen
+..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
 "
                                                AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
                                                Outputs="$(SolutionDir)llvm\intrinsics.gen"/>
@@ -183,9 +185,6 @@
                        <File
                                RelativePath="..\..\lib\VMCore\PassManager.cpp">
                        </File>
-                       <File
-                               RelativePath="..\..\lib\VMCore\SymbolTable.cpp">
-                       </File>
                        <File
                                RelativePath="..\..\lib\VMCore\Type.cpp">
                        </File>
@@ -228,7 +227,7 @@
                                RelativePath="..\..\include\llvm\Constant.h">
                        </File>
                        <File
-                               RelativePath="..\..\lib\VMCore\ConstantFolding.h">
+                               RelativePath="..\..\lib\VMCore\ConstantFold.h">
                        </File>
                        <File
                                RelativePath="..\..\include\llvm\Constants.h">
@@ -299,9 +298,6 @@
                        <File
                                RelativePath="..\..\include\llvm\Assembly\PrintModulePass.h">
                        </File>
-                       <File
-                               RelativePath="..\..\include\llvm\SymbolTable.h">
-                       </File>
                        <File
                                RelativePath="..\..\include\llvm\SymbolTableListTraits.h">
                        </File>

diff --git a/win32/x86/x86.vcproj b/win32/x86/x86.vcproj
index 088d785c9475dd44600f52246715beb69485e8e1..b0024887dcfeccad49f81a05e592a9a14d065a67 100644 (file)
--- a/win32/x86/x86.vcproj
+++ b/win32/x86/x86.vcproj
@@ -116,36 +116,58 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Performing TableGen Step"
-                                               CommandLine="..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
+                                               CommandLine="echo Building $(InputFileName) register names with tblgen
+..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
+echo Building $(InputFileName) register information header with tblgen
 ..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc
+echo Building $(InputFileName) register information implementation with tblgen
 ..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc
+echo Building $(InputFileName) instruction names with tblgen
 ..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc
+echo Building $(InputFileName) instruction information with tblgen
 ..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc
+echo Building $(InputFileName) assembly writer with tblgen
 ..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc
+echo Building $(InputFileName) assembly writer #1 with tblgen
 ..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc
+echo Building $(InputFileName) instruction selector implementation with tblgen
 ..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc
+echo Building $(InputFileName) subtarget information with tblgen
 ..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc
+echo Building $(InputFileName) calling convention information with tblgen
+..\$(IntDir)\TableGen.exe -gen-callingconv -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenCallingConv.inc
 "
-                                               AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
-                                               Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc"/>
+                                               AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)X86CallingConv.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
+                                               Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc;X86GenCallingConv.inc"/>
                                </FileConfiguration>
                                <FileConfiguration
                                        Name="Release|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Performing TableGen Step"
-                                               CommandLine="..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
+                                               CommandLine="echo Building $(InputFileName) register names with tblgen
+..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
+echo Building $(InputFileName) register information header with tblgen
 ..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc
+echo Building $(InputFileName) register information implementation with tblgen
 ..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc
+echo Building $(InputFileName) instruction names with tblgen
 ..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc
+echo Building $(InputFileName) instruction information with tblgen
 ..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc
+echo Building $(InputFileName) assembly writer with tblgen
 ..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc
+echo Building $(InputFileName) assembly writer #1 with tblgen
 ..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc
+echo Building $(InputFileName) instruction selector implementation with tblgen
 ..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc
+echo Building $(InputFileName) subtarget information with tblgen
 ..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc
+echo Building $(InputFileName) calling convention information with tblgen
+..\$(IntDir)\TableGen.exe -gen-callingconv -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenCallingConv.inc
 "
-                                               AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
-                                               Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc"/>
+                                               AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)X86CallingConv.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
+                                               Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc;X86GenCallingConv.inc"/>
                                </FileConfiguration>
                        </File>
                        <File
@@ -158,7 +180,13 @@
                                RelativePath="..\..\lib\Target\X86\X86CodeEmitter.cpp">
                        </File>
                        <File
-                               RelativePath="..\..\lib\Target\X86\X86ELFWriter.cpp">
+                               RelativePath="..\..\lib\Target\X86\X86COFF.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\lib\Target\X86\X86ELFWriterInfo.cpp">
+                       </File>
+                       <File
+                               RelativePath="..\..\lib\Target\X86\X86ELFWriterInfo.h">
                        </File>
                        <File
                                RelativePath="..\..\lib\Target\X86\X86FloatingPoint.cpp">
@@ -213,6 +241,9 @@
                        <File
                                RelativePath="..\..\lib\Target\X86\X86ATTAsmPrinter.h">
                        </File>
+                       <File
+                               RelativePath="..\..\lib\Target\X86\X86CallingConv.td">
+                       </File>
                        <File
                                RelativePath="..\..\lib\Target\X86\X86InstrBuilder.h">
                        </File>