Revert r66024. The JIT encoding for CALLpcrel32 is wrong -- see PR3773, and the

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

diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index b5b755f289a5d883615accf534fef788fb0770a6..b0f33152793e2e404f3bb1d586f825aa2a895f3a 100644 (file)
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -89,11 +89,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
@@ -110,17 +110,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"
@@ -156,11 +161,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
@@ -177,22 +182,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"
@@ -340,6 +340,10 @@
                                RelativePath="..\..\lib\CodeGen\IntrinsicLowering.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\LatencyPriorityQueue.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\LiveInterval.cpp"
                                >
@@ -424,6 +428,10 @@
                                RelativePath="..\..\lib\CodeGen\Passes.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\PBQP.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\PHIElimination.cpp"
                                >
@@ -432,6 +440,10 @@
                                RelativePath="..\..\lib\CodeGen\PostRASchedulerList.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\PreAllocSplitting.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\PrologEpilogInserter.cpp"
                                >
@@ -452,6 +464,10 @@
                                RelativePath="..\..\lib\CodeGen\RegAllocLocal.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\RegAllocPBQP.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\RegAllocSimple.cpp"
                                >
@@ -464,6 +480,22 @@
                                RelativePath="..\..\lib\CodeGen\RegisterScavenging.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\ScheduleDAG.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\ScheduleDAGEmit.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\ScheduleDAGInstrs.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\ScheduleDAGPrinter.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\ShadowStackGC.cpp"
                                >
@@ -472,6 +504,10 @@
                                RelativePath="..\..\lib\CodeGen\SimpleRegisterCoalescing.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\StackProtector.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\StackSlotColoring.cpp"
                                >
@@ -536,23 +572,23 @@
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAG.cpp"
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGFast.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGEmit.cpp"
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGList.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGFast.cpp"
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGRRList.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGList.cpp"
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGSDNodes.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGRRList.cpp"
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGSDNodesEmit.cpp"
                                        >
                                </File>
                                <File
@@ -738,6 +774,10 @@
                                RelativePath="..\..\include\llvm\CodeGen\Passes.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\PBQP.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\PhysRegTracker.h"
                                >