diff --git a/include/llvm/ADT/FoldingSet.h b/include/llvm/ADT/FoldingSet.h index 1a9407108f0..e99cf6fb3de 100644 --- a/include/llvm/ADT/FoldingSet.h +++ b/include/llvm/ADT/FoldingSet.h @@ -16,7 +16,9 @@ #ifndef LLVM_ADT_FOLDINGSET_H #define LLVM_ADT_FOLDINGSET_H +#include "llvm/Support/DataTypes.h" #include "llvm/ADT/SmallVector.h" +#include namespace llvm { diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h index 7cf825638de..939300f8aca 100644 --- a/include/llvm/Analysis/Dominators.h +++ b/include/llvm/Analysis/Dominators.h @@ -304,9 +304,9 @@ protected: Node *RootNode; public: class Node { - friend struct DominatorTree; + friend class DominatorTree; friend struct PostDominatorTree; - friend struct DominatorTreeBase; + friend class DominatorTreeBase; BasicBlock *TheBB; Node *IDom; std::vector Children; diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h index b2bdde07d5c..2f3fc47b977 100644 --- a/include/llvm/Analysis/LoopInfo.h +++ b/include/llvm/Analysis/LoopInfo.h @@ -35,7 +35,7 @@ namespace llvm { -struct ETForest; +class ETForest; class LoopInfo; class PHINode; class Instruction; diff --git a/include/llvm/Bytecode/Archive.h b/include/llvm/Bytecode/Archive.h index 72942423cc2..59d825a7224 100644 --- a/include/llvm/Bytecode/Archive.h +++ b/include/llvm/Bytecode/Archive.h @@ -95,7 +95,7 @@ class ArchiveMember { /// @returns the size of the archive member in bytes. /// @brief Get the size of the archive member. - unsigned getSize() const { return info.getSize(); } + uint64_t getSize() const { return info.getSize(); } /// This method returns the total size of the archive member as it /// appears on disk. This includes the file content, the header, the diff --git a/include/llvm/CodeGen/MachineConstantPool.h b/include/llvm/CodeGen/MachineConstantPool.h index 17ddcf18237..f45c8a7a8d3 100644 --- a/include/llvm/CodeGen/MachineConstantPool.h +++ b/include/llvm/CodeGen/MachineConstantPool.h @@ -61,7 +61,8 @@ inline std::ostream &operator<<(std::ostream &OS, /// It contains a pointer to the value and an offset from the start of /// the constant pool. /// @brief An entry in a MachineConstantPool -struct MachineConstantPoolEntry { +class MachineConstantPoolEntry { +public: /// The constant itself. union { Constant *ConstVal; diff --git a/include/llvm/CodeGen/SelectionDAG.h b/include/llvm/CodeGen/SelectionDAG.h index b64b9c2143b..2448a65ee6a 100644 --- a/include/llvm/CodeGen/SelectionDAG.h +++ b/include/llvm/CodeGen/SelectionDAG.h @@ -322,9 +322,9 @@ public: /// getStore - Helper function to build ISD::STORE nodes. /// - SDOperand getStore(SDOperand Chain, SDOperand Value, SDOperand Ptr, + SDOperand getStore(SDOperand Chain, SDOperand Val, SDOperand Ptr, const Value *SV, int SVOffset, bool isVolatile=false); - SDOperand getTruncStore(SDOperand Chain, SDOperand Value, SDOperand Ptr, + SDOperand getTruncStore(SDOperand Chain, SDOperand Val, SDOperand Ptr, const Value *SV, int SVOffset, MVT::ValueType TVT, bool isVolatile=false); SDOperand getIndexedStore(SDOperand OrigStoe, SDOperand Base, diff --git a/include/llvm/Support/Compressor.h b/include/llvm/Support/Compressor.h index 5e51721e669..52fb5d5b51b 100644 --- a/include/llvm/Support/Compressor.h +++ b/include/llvm/Support/Compressor.h @@ -16,6 +16,7 @@ #include "llvm/Support/DataTypes.h" #include +#include namespace llvm { diff --git a/include/llvm/System/Path.h b/include/llvm/System/Path.h index 77a5cc54e3b..f6b2be0fdf9 100644 --- a/include/llvm/System/Path.h +++ b/include/llvm/System/Path.h @@ -47,7 +47,7 @@ namespace sys { group(999), isDir(false) { } TimeValue getTimestamp() const { return modTime; } - size_t getSize() const { return fileSize; } + uint64_t getSize() const { return fileSize; } uint32_t getMode() const { return mode; } uint32_t getUser() const { return user; } uint32_t getGroup() const { return group; } diff --git a/include/llvm/Transforms/Utils/FunctionUtils.h b/include/llvm/Transforms/Utils/FunctionUtils.h index d8610bba95f..d6e486be99b 100644 --- a/include/llvm/Transforms/Utils/FunctionUtils.h +++ b/include/llvm/Transforms/Utils/FunctionUtils.h @@ -18,7 +18,7 @@ namespace llvm { class BasicBlock; - struct DominatorSet; + class DominatorSet; class Function; class Loop; diff --git a/include/llvm/Transforms/Utils/PromoteMemToReg.h b/include/llvm/Transforms/Utils/PromoteMemToReg.h index 8d886f54877..44b11d7203e 100644 --- a/include/llvm/Transforms/Utils/PromoteMemToReg.h +++ b/include/llvm/Transforms/Utils/PromoteMemToReg.h @@ -20,8 +20,8 @@ namespace llvm { class AllocaInst; -struct DominatorTree; -struct DominanceFrontier; +class DominatorTree; +class DominanceFrontier; class TargetData; class AliasSetTracker; diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp index 97587d50122..fea03a5f407 100644 --- a/lib/CodeGen/BranchFolding.cpp +++ b/lib/CodeGen/BranchFolding.cpp @@ -25,6 +25,7 @@ #include "llvm/Support/CommandLine.h" #include "llvm/ADT/Statistic.h" #include "llvm/ADT/STLExtras.h" +#include using namespace llvm; static Statistic<> NumDeadBlocks("branchfold", "Number of dead blocks removed"); diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 5f1b5826e06..03abac24503 100644 --- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -383,7 +383,7 @@ namespace { bool isAlias(SDOperand Ptr1, int64_t Size1, const Value *SrcValue1, int SrcValueOffset1, SDOperand Ptr2, int64_t Size2, - const Value *SrcValue2, int SrcValueOffset1); + const Value *SrcValue2, int SrcValueOffset2); /// FindAliasInfo - Extracts the relevant alias information from the memory /// node. Returns true if the operand was a load. diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 6e69728ad33..ef9e3f5a1b0 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -1657,16 +1657,16 @@ SDOperand SelectionDAG::getVecLoad(unsigned Count, MVT::ValueType EVT, return getNode(ISD::VLOAD, getVTList(MVT::Vector, MVT::Other), Ops, 5); } -SDOperand SelectionDAG::getStore(SDOperand Chain, SDOperand Value, +SDOperand SelectionDAG::getStore(SDOperand Chain, SDOperand Val, SDOperand Ptr, const Value *SV, int SVOffset, bool isVolatile) { - MVT::ValueType VT = Value.getValueType(); + MVT::ValueType VT = Val.getValueType(); // FIXME: Alignment == 1 for now. unsigned Alignment = 1; SDVTList VTs = getVTList(MVT::Other); SDOperand Undef = getNode(ISD::UNDEF, Ptr.getValueType()); - SDOperand Ops[] = { Chain, Value, Ptr, Undef }; + SDOperand Ops[] = { Chain, Val, Ptr, Undef }; FoldingSetNodeID ID; AddNodeIDNode(ID, ISD::STORE, VTs, Ops, 4); ID.AddInteger(ISD::UNINDEXED); @@ -1679,7 +1679,7 @@ SDOperand SelectionDAG::getStore(SDOperand Chain, SDOperand Value, void *IP = 0; if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) return SDOperand(E, 0); - SDNode *N = new StoreSDNode(Chain, Value, Ptr, Undef, ISD::UNINDEXED, false, + SDNode *N = new StoreSDNode(Chain, Val, Ptr, Undef, ISD::UNINDEXED, false, VT, SV, SVOffset, Alignment, isVolatile); N->setValueTypes(VTs); CSEMap.InsertNode(N, IP); @@ -1687,11 +1687,11 @@ SDOperand SelectionDAG::getStore(SDOperand Chain, SDOperand Value, return SDOperand(N, 0); } -SDOperand SelectionDAG::getTruncStore(SDOperand Chain, SDOperand Value, +SDOperand SelectionDAG::getTruncStore(SDOperand Chain, SDOperand Val, SDOperand Ptr, const Value *SV, int SVOffset, MVT::ValueType SVT, bool isVolatile) { - MVT::ValueType VT = Value.getValueType(); + MVT::ValueType VT = Val.getValueType(); bool isTrunc = VT != SVT; assert(VT > SVT && "Not a truncation?"); @@ -1702,7 +1702,7 @@ SDOperand SelectionDAG::getTruncStore(SDOperand Chain, SDOperand Value, unsigned Alignment = 1; SDVTList VTs = getVTList(MVT::Other); SDOperand Undef = getNode(ISD::UNDEF, Ptr.getValueType()); - SDOperand Ops[] = { Chain, Value, Ptr, Undef }; + SDOperand Ops[] = { Chain, Val, Ptr, Undef }; FoldingSetNodeID ID; AddNodeIDNode(ID, ISD::STORE, VTs, Ops, 4); ID.AddInteger(ISD::UNINDEXED); @@ -1715,7 +1715,7 @@ SDOperand SelectionDAG::getTruncStore(SDOperand Chain, SDOperand Value, void *IP = 0; if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP)) return SDOperand(E, 0); - SDNode *N = new StoreSDNode(Chain, Value, Ptr, Undef, ISD::UNINDEXED, isTrunc, + SDNode *N = new StoreSDNode(Chain, Val, Ptr, Undef, ISD::UNINDEXED, isTrunc, SVT, SV, SVOffset, Alignment, isVolatile); N->setValueTypes(VTs); CSEMap.InsertNode(N, IP); diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc index 048bf602975..1eee2bb3c1f 100644 --- a/lib/System/Win32/Path.inc +++ b/lib/System/Win32/Path.inc @@ -124,7 +124,12 @@ Path::GetTemporaryDirectory(std::string* ErrMsg) { // Append a subdirectory passed on our process id so multiple LLVMs don't // step on each other's toes. +#ifdef __MINGW32__ + // Mingw's Win32 header files are broken. sprintf(pathname, "LLVM_%u", unsigned(GetCurrentProcessId())); +#else + sprintf(pathname, "LLVM_%u", GetCurrentProcessId()); +#endif result.appendComponent(pathname); // If there's a directory left over from a previous LLVM execution that diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp index 343176d6925..3957b941c74 100644 --- a/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -663,7 +663,7 @@ bool X86DAGToDAGISel::MatchAddress(SDOperand N, X86ISelAddressMode &AM, AM.IndexReg = ShVal.Val->getOperand(0); ConstantSDNode *AddVal = cast(ShVal.Val->getOperand(1)); - uint64_t Disp = AM.Disp + AddVal->getValue() << Val; + uint64_t Disp = AM.Disp + (AddVal->getValue() << Val); if (isInt32(Disp)) AM.Disp = Disp; else diff --git a/lib/Target/X86/X86RegisterInfo.h b/lib/Target/X86/X86RegisterInfo.h index fdab3ee7a0a..df43b86d2ae 100644 --- a/lib/Target/X86/X86RegisterInfo.h +++ b/lib/Target/X86/X86RegisterInfo.h @@ -22,9 +22,11 @@ namespace llvm { class TargetInstrInfo; class X86TargetMachine; -struct X86RegisterInfo : public X86GenRegisterInfo { +class X86RegisterInfo : public X86GenRegisterInfo { +public: X86TargetMachine &TM; const TargetInstrInfo &TII; + private: /// Is64Bit - Is the target 64-bits. bool Is64Bit; diff --git a/lib/Transforms/Scalar/PredicateSimplifier.cpp b/lib/Transforms/Scalar/PredicateSimplifier.cpp index ca2762cac71..47f6d3d9820 100644 --- a/lib/Transforms/Scalar/PredicateSimplifier.cpp +++ b/lib/Transforms/Scalar/PredicateSimplifier.cpp @@ -428,7 +428,7 @@ namespace { // "setlt/gt int %a, %b" NE false then %a NE %b if (ConstantBool *CB = dyn_cast(V1)) { - if (CB->getValue() ^ Opcode==NE) + if (CB->getValue() ^ (Opcode==NE)) addNotEqual(BO->getOperand(0), BO->getOperand(1)); } break; @@ -437,7 +437,7 @@ namespace { // "setle/ge int %a, %b" EQ false then %a NE %b // "setle/ge int %a, %b" NE true then %a NE %b if (ConstantBool *CB = dyn_cast(V1)) { - if (CB->getValue() ^ Opcode==EQ) + if (CB->getValue() ^ (Opcode==EQ)) addNotEqual(BO->getOperand(0), BO->getOperand(1)); } break; @@ -486,7 +486,7 @@ namespace { if (ConstantBool *CB = dyn_cast(V1)) { if (ConstantBool *A = dyn_cast(LHS)) { addEqual(RHS, ConstantBool::get(A->getValue() ^ CB->getValue() - ^ Opcode==NE)); + ^ (Opcode==NE))); } } else if (ConstantIntegral *CI = dyn_cast(V1)) { diff --git a/lib/Transforms/Utils/CloneFunction.cpp b/lib/Transforms/Utils/CloneFunction.cpp index 30a7add79ba..3aa7397ef94 100644 --- a/lib/Transforms/Utils/CloneFunction.cpp +++ b/lib/Transforms/Utils/CloneFunction.cpp @@ -313,9 +313,9 @@ void llvm::CloneAndPruneFunctionInto(Function *NewFunc, const Function *OldFunc, assert(NameSuffix && "NameSuffix cannot be null!"); #ifndef NDEBUG - for (Function::const_arg_iterator I = OldFunc->arg_begin(), - E = OldFunc->arg_end(); I != E; ++I) - assert(ValueMap.count(I) && "No mapping from source argument specified!"); + for (Function::const_arg_iterator II = OldFunc->arg_begin(), + E = OldFunc->arg_end(); II != E; ++II) + assert(ValueMap.count(II) && "No mapping from source argument specified!"); #endif PruningFunctionCloner PFC(NewFunc, OldFunc, ValueMap, Returns, diff --git a/tools/bugpoint/ExecutionDriver.cpp b/tools/bugpoint/ExecutionDriver.cpp index f71d7bace61..dedf91eb035 100644 --- a/tools/bugpoint/ExecutionDriver.cpp +++ b/tools/bugpoint/ExecutionDriver.cpp @@ -320,7 +320,7 @@ std::string BugDriver::compileSharedObject(const std::string &BytecodeFile) { bool BugDriver::createReferenceFile(Module *M, const std::string &Filename) { try { compileProgram(Program); - } catch (ToolExecutionError &TEE) { + } catch (ToolExecutionError &) { return false; } try { diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp index ab7109fb855..a7f15a9c3fc 100644 --- a/tools/llvm-ld/llvm-ld.cpp +++ b/tools/llvm-ld/llvm-ld.cpp @@ -499,7 +499,7 @@ int main(int argc, char **argv, char **envp) { // Get the program arguments sys::Path tmp_output("opt_result"); std::string ErrMsg; - if (tmp_output.createTemporaryFileOnDisk(&ErrMsg)) { + if (tmp_output.createTemporaryFileOnDisk(true)) { return PrintAndReturn(ErrMsg); } const char* args[4]; diff --git a/utils/TableGen/AsmWriterEmitter.cpp b/utils/TableGen/AsmWriterEmitter.cpp index b403c84a048..6466b5fecd9 100644 --- a/utils/TableGen/AsmWriterEmitter.cpp +++ b/utils/TableGen/AsmWriterEmitter.cpp @@ -69,7 +69,8 @@ namespace { } namespace llvm { - struct AsmWriterInst { + class AsmWriterInst { + public: std::vector Operands; const CodeGenInstruction *CGI; diff --git a/utils/TableGen/CodeGenInstruction.h b/utils/TableGen/CodeGenInstruction.h index c5b4c3cf729..e1c4c7d6d31 100644 --- a/utils/TableGen/CodeGenInstruction.h +++ b/utils/TableGen/CodeGenInstruction.h @@ -23,7 +23,8 @@ namespace llvm { class Record; class DagInit; - struct CodeGenInstruction { + class CodeGenInstruction { + public: Record *TheDef; // The actual record defining this instruction. std::string Name; // Contents of the 'Name' field. std::string Namespace; // The namespace the instruction is in. diff --git a/utils/TableGen/FileLexer.l b/utils/TableGen/FileLexer.l index c1a7ec06adc..653e9d10fbf 100644 --- a/utils/TableGen/FileLexer.l +++ b/utils/TableGen/FileLexer.l @@ -27,6 +27,7 @@ %x comment %{ +#include "llvm/Config/config.h" #include "Record.h" typedef std::pair*> SubClassRefTy; #include "FileParser.h" diff --git a/utils/TableGen/InstrInfoEmitter.h b/utils/TableGen/InstrInfoEmitter.h index b10c0e170fe..8d27305c0f5 100644 --- a/utils/TableGen/InstrInfoEmitter.h +++ b/utils/TableGen/InstrInfoEmitter.h @@ -24,7 +24,7 @@ namespace llvm { class StringInit; class IntInit; class ListInit; -struct CodeGenInstruction; +class CodeGenInstruction; class InstrInfoEmitter : public TableGenBackend { RecordKeeper &Records; diff --git a/win32/Analysis/Analysis.vcproj b/win32/Analysis/Analysis.vcproj index 77476cb97ad..70af36b2338 100644 --- a/win32/Analysis/Analysis.vcproj +++ b/win32/Analysis/Analysis.vcproj @@ -196,6 +196,9 @@ + + @@ -316,6 +319,9 @@ + + diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj index 5d71d4c8cc3..f67c16177cf 100644 --- a/win32/CodeGen/CodeGen.vcproj +++ b/win32/CodeGen/CodeGen.vcproj @@ -132,6 +132,9 @@ + + @@ -144,6 +147,9 @@ + + @@ -168,9 +174,6 @@ - - @@ -189,6 +192,9 @@ + + @@ -201,6 +207,9 @@ + + + + @@ -261,21 +273,33 @@ + + + + + + + + @@ -288,9 +312,6 @@ - - diff --git a/win32/Support/Support.vcproj b/win32/Support/Support.vcproj index e0b38c6c594..0da1c3f781c 100644 --- a/win32/Support/Support.vcproj +++ b/win32/Support/Support.vcproj @@ -109,6 +109,9 @@ Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + + @@ -124,6 +127,9 @@ AdditionalIncludeDirectories=""/> + + @@ -133,12 +139,21 @@ + + + + + + @@ -169,9 +184,6 @@ - - @@ -211,6 +223,9 @@ + + @@ -226,6 +241,9 @@ + + @@ -271,6 +289,9 @@ + + @@ -304,9 +325,6 @@ - - @@ -320,6 +338,9 @@ + + @@ -329,6 +350,9 @@ + + @@ -359,6 +383,12 @@ + + + + diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj index 61ed4e7021d..1286da3059a 100644 --- a/win32/System/System.vcproj +++ b/win32/System/System.vcproj @@ -109,9 +109,15 @@ Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + + + + @@ -141,9 +147,15 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + + + + diff --git a/win32/Target/Target.vcproj b/win32/Target/Target.vcproj index 35788cc7563..36d5ec92eb5 100644 --- a/win32/Target/Target.vcproj +++ b/win32/Target/Target.vcproj @@ -114,6 +114,9 @@ + + @@ -123,9 +126,6 @@ - - @@ -146,6 +146,9 @@ + + diff --git a/win32/Transforms/Transforms.vcproj b/win32/Transforms/Transforms.vcproj index 09787138b6f..c2449e9c1e9 100644 --- a/win32/Transforms/Transforms.vcproj +++ b/win32/Transforms/Transforms.vcproj @@ -260,26 +260,14 @@ - - - - - - - - + RelativePath="..\..\lib\Transforms\Scalar\PredicateSimplifier.cpp"> @@ -334,12 +322,30 @@ + + + + + + + + + + + + @@ -388,9 +394,6 @@ - - diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj index a0ca5986619..78039b888be 100644 --- a/win32/VMCore/VMCore.vcproj +++ b/win32/VMCore/VMCore.vcproj @@ -198,6 +198,9 @@ + + diff --git a/win32/analyze/analyze.vcproj b/win32/analyze/analyze.vcproj index 94180fbd3aa..6382eeb8c3e 100644 --- a/win32/analyze/analyze.vcproj +++ b/win32/analyze/analyze.vcproj @@ -124,15 +124,6 @@ Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> - - - - - - + + @@ -148,6 +151,9 @@ + + + + diff --git a/win32/config.h b/win32/config.h index 05ee9901afa..5783636c882 100644 --- a/win32/config.h +++ b/win32/config.h @@ -20,3 +20,5 @@ #define LTDL_SHLIB_EXT ".dll" #define LTDL_SYSSEARCHPATH "" #define LLVM_ON_WIN32 1 + +#define strtoll strtol diff --git a/win32/llvm.sln b/win32/llvm.sln index 3ef216e0f46..07e65bf4a07 100644 --- a/win32/llvm.sln +++ b/win32/llvm.sln @@ -220,19 +220,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-prof", "llvm-prof\llvm {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "analyze", "analyze\analyze.vcproj", "{DF8506B5-28D2-4D2E-9A6C-57D5BC98BF76}" - ProjectSection(ProjectDependencies) = postProject - {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} - {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} - {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} - {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {3DC216F5-1DDD-478A-84F8-C124E5C31982} = {3DC216F5-1DDD-478A-84F8-C124E5C31982} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bugpoint", "bugpoint\bugpoint.vcproj", "{57249192-8E29-4D85-8B7A-FEFF1760B1DA}" ProjectSection(ProjectDependencies) = postProject {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} @@ -252,6 +239,8 @@ Global Debug = Debug Release = Release EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {28AA9146-3482-4F41-9CC6-407B1D258508}.Debug.ActiveCfg = Debug|Win32 {28AA9146-3482-4F41-9CC6-407B1D258508}.Debug.Build.0 = Debug|Win32 @@ -365,10 +354,6 @@ Global {ACBE81D9-64B1-4133-823A-807A4E60B454}.Debug.Build.0 = Debug|Win32 {ACBE81D9-64B1-4133-823A-807A4E60B454}.Release.ActiveCfg = Release|Win32 {ACBE81D9-64B1-4133-823A-807A4E60B454}.Release.Build.0 = Release|Win32 - {DF8506B5-28D2-4D2E-9A6C-57D5BC98BF76}.Debug.ActiveCfg = Debug|Win32 - {DF8506B5-28D2-4D2E-9A6C-57D5BC98BF76}.Debug.Build.0 = Debug|Win32 - {DF8506B5-28D2-4D2E-9A6C-57D5BC98BF76}.Release.ActiveCfg = Release|Win32 - {DF8506B5-28D2-4D2E-9A6C-57D5BC98BF76}.Release.Build.0 = Release|Win32 {57249192-8E29-4D85-8B7A-FEFF1760B1DA}.Debug.ActiveCfg = Debug|Win32 {57249192-8E29-4D85-8B7A-FEFF1760B1DA}.Debug.Build.0 = Debug|Win32 {57249192-8E29-4D85-8B7A-FEFF1760B1DA}.Release.ActiveCfg = Release|Win32 diff --git a/win32/opt/opt.vcproj b/win32/opt/opt.vcproj index 9dd6c48efdf..44df0ed0ab5 100644 --- a/win32/opt/opt.vcproj +++ b/win32/opt/opt.vcproj @@ -124,9 +124,18 @@ Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + + + + + + @@ -134,15 +134,15 @@ @@ -166,6 +166,9 @@ + + @@ -184,6 +187,9 @@ + + @@ -234,6 +240,9 @@ + + @@ -243,6 +252,9 @@ + +