[llvm-commits] [llvm] r54898 - in /llvm/trunk: include/llvm/Support/Streams.h lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h win32/Analysis/Analysis.vcproj win32/CodeGen/CodeGen.vcproj win32/Support/Support.vcproj win32/TableGen/TableGen.vcproj win32/Transforms/Transforms.vcproj win32/clang.sln win32/x86/x86.vcproj
Cedric Venet
cedric.venet at laposte.net
Sun Aug 17 11:24:33 PDT 2008
Author: venet
Date: Sun Aug 17 13:24:26 2008
New Revision: 54898
URL: http://llvm.org/viewvc/llvm-project?rev=54898&view=rev
Log:
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/
Modified:
llvm/trunk/include/llvm/Support/Streams.h
llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h
llvm/trunk/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
llvm/trunk/win32/Analysis/Analysis.vcproj
llvm/trunk/win32/CodeGen/CodeGen.vcproj
llvm/trunk/win32/Support/Support.vcproj
llvm/trunk/win32/TableGen/TableGen.vcproj
llvm/trunk/win32/Transforms/Transforms.vcproj
llvm/trunk/win32/clang.sln
llvm/trunk/win32/x86/x86.vcproj
Modified: llvm/trunk/include/llvm/Support/Streams.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Streams.h?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/Streams.h (original)
+++ llvm/trunk/include/llvm/Support/Streams.h Sun Aug 17 13:24:26 2008
@@ -37,6 +37,11 @@
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;
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Sun Aug 17 13:24:26 2008
@@ -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"
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h Sun Aug 17 13:24:26 2008
@@ -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"
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp Sun Aug 17 13:24:26 2008
@@ -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
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp Sun Aug 17 13:24:26 2008
@@ -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"
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h Sun Aug 17 13:24:26 2008
@@ -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"
Modified: llvm/trunk/win32/Analysis/Analysis.vcproj
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/Analysis/Analysis.vcproj?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/win32/Analysis/Analysis.vcproj (original)
+++ llvm/trunk/win32/Analysis/Analysis.vcproj Sun Aug 17 13:24:26 2008
@@ -361,10 +361,6 @@
>
</File>
<File
- RelativePath="..\..\lib\Analysis\LoadValueNumbering.cpp"
- >
- </File>
- <File
RelativePath="..\..\lib\Analysis\LoopInfo.cpp"
>
</File>
@@ -413,10 +409,6 @@
>
</File>
<File
- RelativePath="..\..\lib\Analysis\ValueNumbering.cpp"
- >
- </File>
- <File
RelativePath="..\..\lib\Analysis\ValueTracking.cpp"
>
</File>
Modified: llvm/trunk/win32/CodeGen/CodeGen.vcproj
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/CodeGen/CodeGen.vcproj?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/win32/CodeGen/CodeGen.vcproj (original)
+++ llvm/trunk/win32/CodeGen/CodeGen.vcproj Sun Aug 17 13:24:26 2008
@@ -305,35 +305,31 @@
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"
Modified: llvm/trunk/win32/Support/Support.vcproj
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/Support/Support.vcproj?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/win32/Support/Support.vcproj (original)
+++ llvm/trunk/win32/Support/Support.vcproj Sun Aug 17 13:24:26 2008
@@ -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"
@@ -375,6 +375,10 @@
>
</File>
<File
+ RelativePath="..\..\lib\Support\raw_ostream.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\lib\Support\SlowOperationInformer.cpp"
>
<FileConfiguration
Modified: llvm/trunk/win32/TableGen/TableGen.vcproj
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/TableGen/TableGen.vcproj?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/win32/TableGen/TableGen.vcproj (original)
+++ llvm/trunk/win32/TableGen/TableGen.vcproj Sun Aug 17 13:24:26 2008
@@ -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"
@@ -398,6 +398,10 @@
>
</File>
<File
+ RelativePath="..\..\utils\TableGen\FastISelEmitter.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\utils\TableGen\InstrEnumEmitter.cpp"
>
</File>
@@ -484,6 +488,10 @@
>
</File>
<File
+ RelativePath="..\..\utils\TableGen\FastISelEmitter.h"
+ >
+ </File>
+ <File
RelativePath="..\..\utils\TableGen\InstrEnumEmitter.h"
>
</File>
Modified: llvm/trunk/win32/Transforms/Transforms.vcproj
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/Transforms/Transforms.vcproj?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/win32/Transforms/Transforms.vcproj (original)
+++ llvm/trunk/win32/Transforms/Transforms.vcproj Sun Aug 17 13:24:26 2008
@@ -444,10 +444,6 @@
>
</File>
<File
- RelativePath="..\..\lib\Transforms\Scalar\GCSE.cpp"
- >
- </File>
- <File
RelativePath="..\..\lib\Transforms\Scalar\GVN.cpp"
>
</File>
Modified: llvm/trunk/win32/clang.sln
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/clang.sln?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/win32/clang.sln (original)
+++ llvm/trunk/win32/clang.sln Sun Aug 17 13:24:26 2008
@@ -61,10 +61,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86", "x86\x86.vcproj", "{144EEBF6-8C9B-4473-B715-2C821666AF6C}"
ProjectSection(ProjectDependencies) = postProject
+ {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E}
+ {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4}
{C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99}
{08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897}
{339C2249-26B6-4172-B484-85653029AF57} = {339C2249-26B6-4172-B484-85653029AF57}
- {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Transforms", "Transforms\Transforms.vcproj", "{C59374C1-9FC0-4147-B836-327DFDC52D99}"
@@ -264,9 +265,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangDriver", "..\tools\clang\win32\clangDriver\clangDriver.vcproj", "{7E7DA455-C276-4B93-8D02-8F7E2F629BAF}"
ProjectSection(ProjectDependencies) = postProject
- {030F6909-B2FA-4E53-BEA7-9A559CFC2F73} = {030F6909-B2FA-4E53-BEA7-9A559CFC2F73}
- {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4} = {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4}
{0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489}
+ {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4} = {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4}
{5125C3DB-FBD6-4BF8-8D8B-CE51D6E93BCD} = {5125C3DB-FBD6-4BF8-8D8B-CE51D6E93BCD}
{45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB}
{08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897}
@@ -280,6 +280,7 @@
{28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508}
{0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08}
{6C98551A-4C36-4E74-8419-4D3EEEC9D8E0} = {6C98551A-4C36-4E74-8419-4D3EEEC9D8E0}
+ {030F6909-B2FA-4E53-BEA7-9A559CFC2F73} = {030F6909-B2FA-4E53-BEA7-9A559CFC2F73}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangBasic", "..\tools\clang\win32\clangBasic\clangBasic.vcproj", "{298B4876-6EF1-4E80-85D7-72F80693BBEB}"
Modified: llvm/trunk/win32/x86/x86.vcproj
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/x86/x86.vcproj?rev=54898&r1=54897&r2=54898&view=diff
==============================================================================
--- llvm/trunk/win32/x86/x86.vcproj (original)
+++ llvm/trunk/win32/x86/x86.vcproj Sun Aug 17 13:24:26 2008
@@ -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"
@@ -354,14 +354,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"
>
</File>
@@ -416,10 +408,6 @@
>
</File>
<File
- RelativePath="..\..\lib\Target\X86\X86IntelAsmPrinter.cpp"
- >
- </File>
- <File
RelativePath="..\..\lib\Target\X86\X86ISelDAGToDAG.cpp"
>
</File>
@@ -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"
More information about the llvm-commits
mailing list