Factorize (and generalize) the code promoting SELECT

[oota-llvm.git] / win32 / x86 / x86.vcproj

diff --git a/win32/x86/x86.vcproj b/win32/x86/x86.vcproj
index 3eea978a5ad9708146879de2c5e402a730616c2f..b5d10e8291f5049dbb1cd45190e58ccddce9e085 100644 (file)
--- a/win32/x86/x86.vcproj
+++ b/win32/x86/x86.vcproj
@@ -90,7 +90,7 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|x64"
                        OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
@@ -111,17 +111,22 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories=".;..\..\include;..;..\..\lib\Target\X86"
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               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"
                                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"
@@ -157,7 +162,7 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
                        OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
@@ -178,22 +183,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"
+                               AdditionalIncludeDirectories=".;..\..\include;..;..\..\lib\Target\X86"
+                               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"
@@ -320,7 +320,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|Win32"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -331,7 +331,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="Release|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -369,7 +369,7 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               CommandLine="ml64.exe /c /nologo /Fo &quot;$(IntDir)X86CompilationCallback_Win64.obj&quot; /Zi $(InputPath)"
+                                               CommandLine="ml64.exe /c /nologo /Fo &quot;$(IntDir)X86CompilationCallback_Win64.obj&quot; /Zi $(InputPath)&#x0D;&#x0A;"
                                                Outputs="&quot;$(IntDir)X86CompilationCallback_Win64.obj&quot;"
                                        />
                                </FileConfiguration>
@@ -378,7 +378,7 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               CommandLine="ml64.exe /c /nologo /Fo &quot;$(IntDir)X86CompilationCallback_Win64.obj&quot; /Zi $(InputPath)"
+                                               CommandLine="ml64.exe /c /nologo /Fo &quot;$(IntDir)X86CompilationCallback_Win64.obj&quot; /Zi $(InputPath)&#x0D;&#x0A;"
                                                Outputs="&quot;$(IntDir)X86CompilationCallback_Win64.obj&quot;"
                                        />
                                </FileConfiguration>
@@ -403,6 +403,10 @@
                                RelativePath="..\..\lib\Target\X86\X86FloatingPoint.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\Target\X86\X86FloatingPointRegKill.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\Target\X86\X86InstrFormats.td"
                                >
@@ -431,6 +435,10 @@
                                RelativePath="..\..\lib\Target\X86\X86RegisterInfo.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\Target\X86\X86Relocations.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\Target\X86\X86Subtarget.cpp"
                                >