Make it compile on VC2005:

- update VC projects.
- Add an overload to llvm::Stream for <<, since std::hex and std::dec have type std::ios_base& (*)(std::ios_base&) in VC++. (templating the function don't work, due to ambiguities)
- add ../ on several include in X86/AsmPrinter/

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

diff --git a/include/llvm/Support/Streams.h b/include/llvm/Support/Streams.h
index 2444d5b6af35f28d8f6f153973531c508cccb5c4..e9208644da4a043b995d0e7a7d16600207d0f0bb 100644 (file)
--- a/include/llvm/Support/Streams.h
+++ b/include/llvm/Support/Streams.h
@@ -37,6 +37,11 @@ namespace llvm {
 
     StreamTy *stream() const { return Stream; }
 
+    inline BaseStream &operator << (std::ios_base &(*Func)(std::ios_base&)) {
+      if (Stream) *Stream << Func;
+      return *this;
+    }
+
     inline BaseStream &operator << (StreamTy &(*Func)(StreamTy&)) {
       if (Stream) *Stream << Func;
       return *this;

diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
index 8a6b60425ec7056352f1653b70d69a2110227d8c..575762e623f22e40f04beea22ddd75b057b91182 100644 (file)
--- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
@@ -15,11 +15,11 @@
 
 #define DEBUG_TYPE "asm-printer"
 #include "X86ATTAsmPrinter.h"
-#include "X86.h"
-#include "X86COFF.h"
-#include "X86MachineFunctionInfo.h"
-#include "X86TargetMachine.h"
-#include "X86TargetAsmInfo.h"
+#include "../X86.h"
+#include "../X86COFF.h"
+#include "../X86MachineFunctionInfo.h"
+#include "../X86TargetMachine.h"
+#include "../X86TargetAsmInfo.h"
 #include "llvm/CallingConv.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"

diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h
index f9479fd41d47563107384c1df3829dd11f4a2425..235c72efaee6615246132f93523b52670dcf12cb 100644 (file)
--- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h
+++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h
@@ -14,9 +14,9 @@
 #ifndef X86ATTASMPRINTER_H
 #define X86ATTASMPRINTER_H
 
-#include "X86.h"
-#include "X86MachineFunctionInfo.h"
-#include "X86TargetMachine.h"
+#include "../X86.h"
+#include "../X86MachineFunctionInfo.h"
+#include "../X86TargetMachine.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/DwarfWriter.h"

diff --git a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
index 8144ee85a9e79284f081dff2c55af52fdc1053cf..9b69264761b2b91c0ad3452ad48096fd727bfc77 100644 (file)
--- a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
@@ -16,7 +16,7 @@
 
 #include "X86ATTAsmPrinter.h"
 #include "X86IntelAsmPrinter.h"
-#include "X86Subtarget.h"
+#include "../X86Subtarget.h"
 using namespace llvm;
 
 /// createX86CodePrinterPass - Returns a pass that prints the X86 assembly code

diff --git a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
index 1822c1f914a42eed9c820761a7251187532d5998..75812f344062ece2791f5c706c9514f98e285ffd 100644 (file)
--- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
@@ -15,9 +15,9 @@
 
 #define DEBUG_TYPE "asm-printer"
 #include "X86IntelAsmPrinter.h"
-#include "X86InstrInfo.h"
-#include "X86TargetAsmInfo.h"
-#include "X86.h"
+#include "../X86InstrInfo.h"
+#include "../X86TargetAsmInfo.h"
+#include "../X86.h"
 #include "llvm/CallingConv.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"

diff --git a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
index c9ca072baf5e6fe919a3b32dc6814c7f6ac2bbad..faf26bd0090f38fba9ebf888eff2bdaf19a20847 100644 (file)
--- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
+++ b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
@@ -14,9 +14,9 @@
 #ifndef X86INTELASMPRINTER_H
 #define X86INTELASMPRINTER_H
 
-#include "X86.h"
-#include "X86MachineFunctionInfo.h"
-#include "X86TargetMachine.h"
+#include "../X86.h"
+#include "../X86MachineFunctionInfo.h"
+#include "../X86TargetMachine.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/Support/Compiler.h"

diff --git a/win32/Analysis/Analysis.vcproj b/win32/Analysis/Analysis.vcproj
index 5398ae5f8d6d995392c49d49010efbe897c7105d..5da06bed6cadccedbaad5e07b649e59abc2b2aad 100644 (file)
--- a/win32/Analysis/Analysis.vcproj
+++ b/win32/Analysis/Analysis.vcproj
@@ -360,10 +360,6 @@
                                RelativePath="..\..\lib\Analysis\LibCallSemantics.cpp"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\lib\Analysis\LoadValueNumbering.cpp"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\lib\Analysis\LoopInfo.cpp"
                                >
@@ -412,10 +408,6 @@
                                RelativePath="..\..\lib\Analysis\Trace.cpp"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\lib\Analysis\ValueNumbering.cpp"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\lib\Analysis\ValueTracking.cpp"
                                >

diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index 10aa2d8c34fe42b38d23f80802931ccc0d7a5e9c..ac797efc15c753a84651cde973d07e3ddc47e77a 100644 (file)
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -304,36 +304,32 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File
-                               RelativePath="..\..\lib\CodeGen\AsmPrinter.cpp"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\BranchFolding.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\Collector.cpp"
+                               RelativePath="..\..\lib\CodeGen\ELFWriter.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\CollectorMetadata.cpp"
+                               RelativePath="..\..\lib\CodeGen\ELFWriter.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\Collectors.cpp"
+                               RelativePath="..\..\lib\CodeGen\GCMetadata.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\DwarfWriter.cpp"
+                               RelativePath="..\..\lib\CodeGen\GCMetadataPrinter.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\ELFWriter.cpp"
+                               RelativePath="..\..\lib\CodeGen\GCs.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\ELFWriter.h"
+                               RelativePath="..\..\lib\CodeGen\GCStrategy.cpp"
                                >
                        </File>
                        <File
@@ -421,7 +417,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\OcamlCollector.cpp"
+                               RelativePath="..\..\lib\CodeGen\OcamlGC.cpp"
                                >
                        </File>
                        <File
@@ -469,7 +465,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\ShadowStackCollector.cpp"
+                               RelativePath="..\..\lib\CodeGen\ShadowStackGC.cpp"
                                >
                        </File>
                        <File
@@ -568,6 +564,22 @@
                                        >
                                </File>
                        </Filter>
+                       <Filter
+                               Name="AsmPrinter"
+                               >
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\AsmPrinter\AsmPrinter.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\AsmPrinter\DwarfWriter.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\AsmPrinter\OcamlGCPrinter.cpp"
+                                       >
+                               </File>
+                       </Filter>
                </Filter>
                <Filter
                        Name="Header Files"

diff --git a/win32/Support/Support.vcproj b/win32/Support/Support.vcproj
index 13bc5b38d4af9c869a27fa60aabaa2a77a96eb15..027668d686c3b5f117b8bfa76713e6ed7f989f71 100644 (file)
--- a/win32/Support/Support.vcproj
+++ b/win32/Support/Support.vcproj
@@ -90,11 +90,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
                        OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -111,22 +111,17 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               RuntimeLibrary="2"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -162,11 +157,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|x64"
                        OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -183,17 +178,22 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               RuntimeLibrary="2"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -374,6 +374,10 @@
                                RelativePath="..\..\lib\Support\PluginLoader.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\Support\raw_ostream.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\Support\SlowOperationInformer.cpp"
                                >

diff --git a/win32/TableGen/TableGen.vcproj b/win32/TableGen/TableGen.vcproj
index aef3018aabd538556a24f038432edefcbeb47ec7..913462b54de97aa4a44c767736bcb3aabc051336 100644 (file)
--- a/win32/TableGen/TableGen.vcproj
+++ b/win32/TableGen/TableGen.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="8.00"
+       Version="8,00"
        Name="TableGen"
        ProjectGUID="{339C2249-26B6-4172-B484-85653029AF57}"
        RootNamespace="TableGen"
@@ -105,11 +105,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
                        OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -126,22 +126,17 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               RuntimeLibrary="2"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -159,12 +154,13 @@
                        <Tool
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)\TableGen.exe"
-                               LinkIncremental="2"
+                               LinkIncremental="1"
                                AdditionalLibraryDirectories=""
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/TableGen.pdb"
                                SubSystem="1"
-                               TargetMachine="17"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -192,11 +188,11 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|x64"
                        OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -213,17 +209,22 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               RuntimeLibrary="2"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -241,13 +242,12 @@
                        <Tool
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)\TableGen.exe"
-                               LinkIncremental="1"
+                               LinkIncremental="2"
                                AdditionalLibraryDirectories=""
                                GenerateDebugInformation="true"
+                               ProgramDatabaseFile="$(OutDir)/TableGen.pdb"
                                SubSystem="1"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -397,6 +397,10 @@
                                RelativePath="..\..\utils\TableGen\DAGISelEmitter.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\utils\TableGen\FastISelEmitter.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\utils\TableGen\InstrEnumEmitter.cpp"
                                >
@@ -483,6 +487,10 @@
                                RelativePath="..\..\utils\TableGen\DAGISelEmitter.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\utils\TableGen\FastISelEmitter.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\utils\TableGen\InstrEnumEmitter.h"
                                >

diff --git a/win32/Transforms/Transforms.vcproj b/win32/Transforms/Transforms.vcproj
index 6ed3766781eec9efaa05eeaf3ab90a2f46b8d16b..ef57d430b11ac81bac3b2f078afe45d6ef4bbcd3 100644 (file)
--- a/win32/Transforms/Transforms.vcproj
+++ b/win32/Transforms/Transforms.vcproj
@@ -443,10 +443,6 @@
                                        RelativePath="..\..\lib\Transforms\Scalar\DeadStoreElimination.cpp"
                                        >
                                </File>
-                               <File
-                                       RelativePath="..\..\lib\Transforms\Scalar\GCSE.cpp"
-                                       >
-                               </File>
                                <File
                                        RelativePath="..\..\lib\Transforms\Scalar\GVN.cpp"
                                        >

diff --git a/win32/clang.sln b/win32/clang.sln
index d6cc44ff5a4624caf2f489f9b173f894b8f15452..b1257fdb73ce4c58cc914284e022c637d02f5263 100644 (file)
--- a/win32/clang.sln
+++ b/win32/clang.sln
@@ -61,10 +61,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Analysis", "Analysis\Analys
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86", "x86\x86.vcproj", "{144EEBF6-8C9B-4473-B715-2C821666AF6C}"\r
        ProjectSection(ProjectDependencies) = postProject\r
+               {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E}\r
+               {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4}\r
                {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99}\r
                {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897}\r
                {339C2249-26B6-4172-B484-85653029AF57} = {339C2249-26B6-4172-B484-85653029AF57}\r
-               {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Transforms", "Transforms\Transforms.vcproj", "{C59374C1-9FC0-4147-B836-327DFDC52D99}"\r
@@ -264,9 +265,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangCodeGen", "..\tools\cl
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangDriver", "..\tools\clang\win32\clangDriver\clangDriver.vcproj", "{7E7DA455-C276-4B93-8D02-8F7E2F629BAF}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {030F6909-B2FA-4E53-BEA7-9A559CFC2F73} = {030F6909-B2FA-4E53-BEA7-9A559CFC2F73}\r
-               {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4} = {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4}\r
                {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489}\r
+               {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4} = {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4}\r
                {5125C3DB-FBD6-4BF8-8D8B-CE51D6E93BCD} = {5125C3DB-FBD6-4BF8-8D8B-CE51D6E93BCD}\r
                {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB}\r
                {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897}\r
@@ -280,6 +280,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangDriver", "..\tools\cla
                {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508}\r
                {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08}\r
                {6C98551A-4C36-4E74-8419-4D3EEEC9D8E0} = {6C98551A-4C36-4E74-8419-4D3EEEC9D8E0}\r
+               {030F6909-B2FA-4E53-BEA7-9A559CFC2F73} = {030F6909-B2FA-4E53-BEA7-9A559CFC2F73}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangBasic", "..\tools\clang\win32\clangBasic\clangBasic.vcproj", "{298B4876-6EF1-4E80-85D7-72F80693BBEB}"\r

diff --git a/win32/x86/x86.vcproj b/win32/x86/x86.vcproj
index 7001947b8127dcdbc74b48a4b802dae868dd321b..78801743eee47a25c147bdc1558b8dc1e6d500ea 100644 (file)
--- a/win32/x86/x86.vcproj
+++ b/win32/x86/x86.vcproj
@@ -90,7 +90,7 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
                        OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
@@ -111,22 +111,17 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
                                AdditionalIncludeDirectories=".;..\..\include;.."
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               RuntimeLibrary="2"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -162,7 +157,7 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|x64"
                        OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
@@ -183,17 +178,22 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories=".;..\..\include;.."
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               RuntimeLibrary="2"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -320,7 +320,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="Release|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -331,7 +331,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|Win32"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -353,14 +353,6 @@
                                        />
                                </FileConfiguration>
                        </File>
-                       <File
-                               RelativePath="..\..\lib\Target\X86\X86AsmPrinter.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\lib\Target\X86\X86ATTAsmPrinter.cpp"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\lib\Target\X86\X86CodeEmitter.cpp"
                                >
@@ -415,10 +407,6 @@
                                RelativePath="..\..\lib\Target\X86\X86InstrX86-64.td"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\lib\Target\X86\X86IntelAsmPrinter.cpp"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\lib\Target\X86\X86ISelDAGToDAG.cpp"
                                >
@@ -447,6 +435,34 @@
                                RelativePath="..\..\lib\Target\X86\X86TargetMachine.cpp"
                                >
                        </File>
+                       <Filter
+                               Name="AsmPrinter"
+                               >
+                               <File
+                                       RelativePath="..\..\lib\Target\X86\AsmPrinter\X86AsmPrinter.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\Target\X86\AsmPrinter\X86AsmPrinter.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\Target\X86\AsmPrinter\X86ATTAsmPrinter.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\Target\X86\AsmPrinter\X86ATTAsmPrinter.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\Target\X86\AsmPrinter\X86IntelAsmPrinter.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\Target\X86\AsmPrinter\X86IntelAsmPrinter.h"
+                                       >
+                               </File>
+                       </Filter>
                </Filter>
                <Filter
                        Name="Header Files"