Revert r66024. The JIT encoding for CALLpcrel32 is wrong -- see PR3773, and the
[oota-llvm.git] / win32 / CodeGen / CodeGen.vcproj
index f4ec8f1eaf98afb7a9aa2aa7c80c498ecf1c28ee..b0f33152793e2e404f3bb1d586f825aa2a895f3a 100644 (file)
                <Platform
                        Name="Win32"
                />
+               <Platform
+                       Name="x64"
+               />
        </Platforms>
        <ToolFiles>
        </ToolFiles>
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="..\Debug"
-                       IntermediateDirectory="Debug"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="4"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <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"
+                               StringPooling="true"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               ForceConformanceInForLoopScope="true"
+                               RuntimeTypeInfo="true"
+                               UsePrecompiledHeader="0"
+                               ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                               DisableSpecificWarnings="4355,4146,4800"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLibrarianTool"
+                               OutputFile="$(OutDir)/CodeGen.lib"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        CharacterSet="2"
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="..\Release"
-                       IntermediateDirectory="Release"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="4"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               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"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               ForceConformanceInForLoopScope="true"
+                               RuntimeTypeInfo="true"
+                               UsePrecompiledHeader="0"
+                               ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                               DisableSpecificWarnings="4355,4146,4800"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLibrarianTool"
+                               OutputFile="$(OutDir)/CodeGen.lib"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        CharacterSet="2"
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                        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\BreakCriticalMachineEdges.cpp"
+                               RelativePath="..\..\lib\CodeGen\DeadMachineInstructionElim.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\CollectorMetadata.cpp"
+                               RelativePath="..\..\lib\CodeGen\ELFWriter.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\Collectors.cpp"
+                               RelativePath="..\..\lib\CodeGen\ELFWriter.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\DwarfWriter.cpp"
+                               RelativePath="..\..\lib\CodeGen\GCMetadata.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\ELFWriter.cpp"
+                               RelativePath="..\..\lib\CodeGen\GCMetadataPrinter.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\ELFWriter.h"
+                               RelativePath="..\..\lib\CodeGen\GCStrategy.cpp"
                                >
                        </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\IntrinsicLowering.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\LatencyPriorityQueue.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\LiveInterval.cpp"
                                >
                                RelativePath="..\..\lib\CodeGen\LiveIntervalAnalysis.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\LiveStackAnalysis.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\LiveVariables.cpp"
                                >
                                RelativePath="..\..\lib\CodeGen\LLVMTargetMachine.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\LoopAligner.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\LowerSubregs.cpp"
                                >
                                RelativePath="..\..\lib\CodeGen\MachineInstr.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\MachineLICM.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\MachineLoopInfo.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\MachineModuleInfo.cpp"
                                >
                                RelativePath="..\..\lib\CodeGen\MachinePassRegistry.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\MachineRegisterInfo.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\MachineSink.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\MachOWriter.cpp"
                                >
                                RelativePath="..\..\lib\CodeGen\MachOWriter.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\OcamlGC.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\Passes.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\PBQP.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\PHIElimination.cpp"
                                >
                                RelativePath="..\..\lib\CodeGen\PostRASchedulerList.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\PreAllocSplitting.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\PrologEpilogInserter.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\PseudoSourceValue.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\RegAllocBigBlock.cpp"
                                >
                                RelativePath="..\..\lib\CodeGen\RegAllocLocal.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\RegAllocPBQP.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\RegAllocSimple.cpp"
                                >
                                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"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\SimpleRegisterCoalescing.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\StackProtector.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\StackSlotColoring.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\StrongPHIElimination.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\TargetInstrInfoImpl.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\TwoAddressInstructionPass.cpp"
                                >
                                        RelativePath="..\..\lib\CodeGen\SelectionDAG\DAGCombiner.cpp"
                                        >
                                </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\FastISel.cpp"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\..\lib\CodeGen\SelectionDAG\LegalizeDAG.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAG.cpp"
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\LegalizeFloatTypes.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\LegalizeIntegerTypes.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\LegalizeTypes.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\LegalizeTypesGeneric.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\LegalizeVectorTypes.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGFast.cpp"
                                        >
                                </File>
                                <File
                                        RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGRRList.cpp"
                                        >
                                </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGSDNodes.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGSDNodesEmit.cpp"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\..\lib\CodeGen\SelectionDAG\SelectionDAG.cpp"
                                        >
                                </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\SelectionDAGBuild.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\lib\CodeGen\SelectionDAG\SelectionDAGBuild.h"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\..\lib\CodeGen\SelectionDAG\SelectionDAGISel.cpp"
                                        >
                                        >
                                </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"
                                RelativePath="..\..\include\llvm\CodeGen\AsmPrinter.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\CodeGen\BreakCriticalMachineEdge.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\CallingConvLower.h"
                                >
                                RelativePath="..\..\include\llvm\CodeGen\IntrinsicLowering.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\SelectionDAG\LegalizeTypes.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\LinkAllCodegenComponents.h"
                                >
                                RelativePath="..\..\include\llvm\CodeGen\MachineLocation.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\CodeGen\MachineLoopInfo.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\MachineModuleInfo.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\CodeGen\MachineOperand.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\MachinePassRegistry.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\CodeGen\MachineRegisterInfo.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\MachineRelocation.h"
                                >
                                RelativePath="..\..\include\llvm\CodeGen\Passes.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\CodeGen\PBQP.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\PhysRegTracker.h"
                                >
                                >
                        </File>
                        <File
-                               RelativePath="..\..\lib\CodeGen\SimpleRegisterCoalescing.h"
+                               RelativePath="..\..\lib\CodeGen\SelectionDAG\SimpleBBISel.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\llvm\CodeGen\SSARegMap.h"
+                               RelativePath="..\..\lib\CodeGen\SimpleRegisterCoalescing.h"
                                >
                        </File>
                        <File