Unbreak VC++ build.

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

10 files changed, 130 insertions, 52 deletions

diff --git a/win32/Analysis/Analysis.vcproj b/win32/Analysis/Analysis.vcproj
index d224139..56befea 100644
--- a/win32/Analysis/Analysis.vcproj
+++ b/win32/Analysis/Analysis.vcproj
@@ -133,9 +133,6 @@
 				RelativePath="..\..\lib\Analysis\ConstantFolding.cpp">
 			</File>
 			<File
-				RelativePath="..\..\lib\Analysis\ConstantRange.cpp">
-			</File>
-			<File
 				RelativePath="..\..\lib\Analysis\InstCount.cpp">
 			</File>
 			<File
@@ -151,6 +148,9 @@
 				RelativePath="..\..\lib\Analysis\LoopInfo.cpp">
 			</File>
 			<File
+				RelativePath="..\..\lib\Analysis\LoopPass.cpp">
+			</File>
+			<File
 				RelativePath="..\..\lib\Analysis\PostDominators.cpp">
 			</File>
 			<File
@@ -241,6 +241,9 @@
 				RelativePath="..\..\include\llvm\Analysis\LoopInfo.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\Analysis\LoopPass.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\Analysis\Passes.h">
 			</File>
 			<File
diff --git a/win32/Bytecode/Bytecode.vcproj b/win32/Bytecode/Bytecode.vcproj
index b962f1a..d0980b9 100644
--- a/win32/Bytecode/Bytecode.vcproj
+++ b/win32/Bytecode/Bytecode.vcproj
@@ -134,9 +134,6 @@
 					RelativePath="..\..\lib\Bytecode\Writer\SlotCalculator.h">
 				</File>
 				<File
-					RelativePath="..\..\lib\Bytecode\Writer\SlotTable.h">
-				</File>
-				<File
 					RelativePath="..\..\lib\Bytecode\Writer\Writer.cpp">
 				</File>
 				<File
diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index 43ef031..3486f79 100644
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -121,6 +121,9 @@
 				RelativePath="..\..\lib\CodeGen\ELFWriter.cpp">
 			</File>
 			<File
+				RelativePath="..\..\lib\CodeGen\ELFWriter.h">
+			</File>
+			<File
 				RelativePath="..\..\lib\CodeGen\IntrinsicLowering.cpp">
 			</File>
 			<File
@@ -139,18 +142,24 @@
 				RelativePath="..\..\lib\CodeGen\MachineBasicBlock.cpp">
 			</File>
 			<File
-				RelativePath="..\..\lib\CodeGen\MachineDebugInfo.cpp">
-			</File>
-			<File
 				RelativePath="..\..\lib\CodeGen\MachineFunction.cpp">
 			</File>
 			<File
 				RelativePath="..\..\lib\CodeGen\MachineInstr.cpp">
 			</File>
 			<File
+				RelativePath="..\..\lib\CodeGen\MachineModuleInfo.cpp">
+			</File>
+			<File
 				RelativePath="..\..\lib\CodeGen\MachinePassRegistry.cpp">
 			</File>
 			<File
+				RelativePath="..\..\lib\CodeGen\MachOWriter.cpp">
+			</File>
+			<File
+				RelativePath="..\..\lib\CodeGen\MachOWriter.h">
+			</File>
+			<File
 				RelativePath="..\..\lib\CodeGen\Passes.cpp">
 			</File>
 			<File
@@ -169,6 +178,9 @@
 				RelativePath="..\..\lib\CodeGen\RegAllocSimple.cpp">
 			</File>
 			<File
+				RelativePath="..\..\lib\CodeGen\RegisterScavenging.cpp">
+			</File>
+			<File
 				RelativePath="..\..\lib\CodeGen\TwoAddressInstructionPass.cpp">
 			</File>
 			<File
@@ -181,6 +193,9 @@
 				Name="SelectionDAG"
 				Filter="">
 				<File
+					RelativePath="..\..\lib\CodeGen\SelectionDAG\CallingConvLower.cpp">
+				</File>
+				<File
 					RelativePath="..\..\lib\CodeGen\SelectionDAG\DAGCombiner.cpp">
 				</File>
 				<File
@@ -220,10 +235,13 @@
 				RelativePath="..\..\include\llvm\CodeGen\AsmPrinter.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\CodeGen\CallingConvLower.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\CodeGen\DwarfWriter.h">
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\CodeGen\ELFWriter.h">
+				RelativePath="..\..\include\llvm\CodeGen\FileWriters.h">
 			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\InstrScheduling.h">
@@ -274,13 +292,16 @@
 				RelativePath="..\..\include\llvm\CodeGen\MachineLocation.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\CodeGen\MachineModuleInfo.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\CodeGen\MachinePassRegistry.h">
 			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\MachineRelocation.h">
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\CodeGen\MachOWriter.h">
+				RelativePath="..\..\include\llvm\CodeGen\MachORelocation.h">
 			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\Passes.h">
@@ -292,6 +313,9 @@
 				RelativePath="..\..\include\llvm\CodeGen\RegAllocRegistry.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\CodeGen\RegisterScavenging.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\CodeGen\RuntimeLibcalls.h">
 			</File>
 			<File
diff --git a/win32/Support/Support.vcproj b/win32/Support/Support.vcproj
index 613bb0f..56e98d2 100644
--- a/win32/Support/Support.vcproj
+++ b/win32/Support/Support.vcproj
@@ -116,6 +116,9 @@
 				RelativePath="..\..\lib\Support\Annotation.cpp">
 			</File>
 			<File
+				RelativePath="..\..\lib\Support\APInt.cpp">
+			</File>
+			<File
 				RelativePath="..\..\lib\Support\CommandLine.cpp">
 			</File>
 			<File
@@ -128,7 +131,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\lib\Support\CStringMap.cpp">
+				RelativePath="..\..\lib\Support\ConstantRange.cpp">
 			</File>
 			<File
 				RelativePath="..\..\lib\Support\Debug.cpp">
@@ -173,6 +176,9 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\lib\Support\SmallPtrSet.cpp">
+			</File>
+			<File
 				RelativePath="..\..\lib\Support\Statistic.cpp">
 			</File>
 			<File
@@ -182,6 +188,9 @@
 				RelativePath="..\..\lib\Support\StringExtras.cpp">
 			</File>
 			<File
+				RelativePath="..\..\lib\Support\StringMap.cpp">
+			</File>
+			<File
 				RelativePath="..\..\lib\Support\SystemUtils.cpp">
 			</File>
 			<File
@@ -302,6 +311,9 @@
 				RelativePath="..\..\include\llvm\Support\MathExtras.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\Support\OutputBuffer.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\Support\PassNameParser.h">
 			</File>
 			<File
@@ -342,10 +354,10 @@
 			Name="ADT"
 			Filter="">
 			<File
-				RelativePath="..\..\include\llvm\Adt\BitSetVector.h">
+				RelativePath="..\..\include\llvm\ADT\APInt.h">
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\ADT\CStringMap.h">
+				RelativePath="..\..\include\llvm\ADT\BitVector.h">
 			</File>
 			<File
 				RelativePath="..\..\include\llvm\Adt\DenseMap.h">
@@ -375,6 +387,9 @@
 				RelativePath="..\..\include\llvm\Adt\ilist">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\ADT\IndexedMap.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\Adt\iterator">
 			</File>
 			<File
@@ -390,6 +405,12 @@
 				RelativePath="..\..\include\llvm\Adt\SetVector.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\ADT\SmallPtrSet.h">
+			</File>
+			<File
+				RelativePath="..\..\include\llvm\ADT\SmallSet.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\ADT\SmallString.h">
 			</File>
 			<File
@@ -405,6 +426,9 @@
 				RelativePath="..\..\include\llvm\Adt\StringExtras.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\ADT\StringMap.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\Adt\Tree.h">
 			</File>
 			<File
diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj
index 1286da3..e5cb3e8 100644
--- a/win32/System/System.vcproj
+++ b/win32/System/System.vcproj
@@ -113,6 +113,9 @@
 				RelativePath="..\..\lib\System\Alarm.cpp">
 			</File>
 			<File
+				RelativePath="..\..\lib\System\Disassembler.cpp">
+			</File>
+			<File
 				RelativePath="..\..\lib\System\DynamicLibrary.cpp">
 			</File>
 			<File
@@ -151,6 +154,9 @@
 				RelativePath="..\..\include\llvm\System\Alarm.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\System\Disassembler.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\System\DynamicLibrary.h">
 			</File>
 			<File
diff --git a/win32/TableGen/TableGen.vcproj b/win32/TableGen/TableGen.vcproj
index e0a02b7..407da44 100644
--- a/win32/TableGen/TableGen.vcproj
+++ b/win32/TableGen/TableGen.vcproj
@@ -129,6 +129,9 @@
 				RelativePath="..\..\utils\TableGen\AsmWriterEmitter.cpp">
 			</File>
 			<File
+				RelativePath="..\..\utils\TableGen\CallingConvEmitter.cpp">
+			</File>
+			<File
 				RelativePath="..\..\utils\TableGen\CodeEmitterGen.cpp">
 			</File>
 			<File
@@ -209,6 +212,9 @@
 				RelativePath="..\..\utils\TableGen\AsmWriterEmitter.h">
 			</File>
 			<File
+				RelativePath="..\..\utils\TableGen\CallingConvEmitter.h">
+			</File>
+			<File
 				RelativePath="..\..\utils\TableGen\CodeEmitterGen.h">
 			</File>
 			<File
diff --git a/win32/Target/Target.vcproj b/win32/Target/Target.vcproj
index 36d5ec9..da5f87f 100644
--- a/win32/Target/Target.vcproj
+++ b/win32/Target/Target.vcproj
@@ -133,6 +133,9 @@
 				RelativePath="..\..\lib\Target\TargetMachineRegistry.cpp">
 			</File>
 			<File
+				RelativePath="..\..\lib\Target\TargetMachOWriterInfo.cpp">
+			</File>
+			<File
 				RelativePath="..\..\lib\Target\TargetSubtarget.cpp">
 			</File>
 		</Filter>
@@ -153,6 +156,9 @@
 				RelativePath="..\..\include\llvm\Target\TargetData.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\Target\TargetELFWriterInfo.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\Target\TargetFrameInfo.h">
 			</File>
 			<File
@@ -174,6 +180,9 @@
 				RelativePath="..\..\include\llvm\Target\TargetMachineRegistry.h">
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\Target\TargetMachOWriterInfo.h">
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\Target\TargetOptions.h">
 			</File>
 			<File
diff --git a/win32/Transforms/Transforms.vcproj b/win32/Transforms/Transforms.vcproj
index e1856da..f756c62 100644
--- a/win32/Transforms/Transforms.vcproj
+++ b/win32/Transforms/Transforms.vcproj
@@ -108,18 +108,6 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\..\lib\Transforms\ExprTypeConvert.cpp">
-			</File>
-			<File
-				RelativePath="..\..\lib\Transforms\LevelRaise.cpp">
-			</File>
-			<File
-				RelativePath="..\..\lib\Transforms\TransformInternals.cpp">
-			</File>
-			<File
-				RelativePath="..\..\lib\Transforms\TransformInternals.h">
-			</File>
 			<Filter
 				Name="Instrumentation"
 				Filter="">
@@ -130,9 +118,6 @@
 					RelativePath="..\..\lib\Transforms\Instrumentation\EdgeProfiling.cpp">
 				</File>
 				<File
-					RelativePath="..\..\lib\Transforms\Instrumentation\EmitFunctions.cpp">
-				</File>
-				<File
 					RelativePath="..\..\lib\Transforms\Instrumentation\ProfilingUtils.cpp">
 				</File>
 				<File
@@ -144,9 +129,6 @@
 				<File
 					RelativePath="..\..\lib\Transforms\Instrumentation\RSProfiling.h">
 				</File>
-				<File
-					RelativePath="..\..\lib\Transforms\Instrumentation\TraceBasicBlocks.cpp">
-				</File>
 			</Filter>
 			<Filter
 				Name="IPO"
@@ -167,9 +149,6 @@
 					RelativePath="..\..\lib\Transforms\Ipo\ExtractFunction.cpp">
 				</File>
 				<File
-					RelativePath="..\..\lib\Transforms\Ipo\FunctionResolution.cpp">
-				</File>
-				<File
 					RelativePath="..\..\lib\Transforms\Ipo\GlobalDCE.cpp">
 				</File>
 				<File
@@ -209,6 +188,9 @@
 					RelativePath="..\..\lib\Transforms\Ipo\SimplifyLibCalls.cpp">
 				</File>
 				<File
+					RelativePath="..\..\lib\Transforms\IPO\StripDeadPrototypes.cpp">
+				</File>
+				<File
 					RelativePath="..\..\lib\Transforms\Ipo\StripSymbols.cpp">
 				</File>
 			</Filter>
diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj
index c9b4b5e..9ccf289 100644
--- a/win32/VMCore/VMCore.vcproj
+++ b/win32/VMCore/VMCore.vcproj
@@ -116,7 +116,7 @@
 				RelativePath="..\..\lib\VMCore\BasicBlock.cpp">
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\ConstantFolding.cpp">
+				RelativePath="..\..\lib\VMCore\ConstantFold.cpp">
 			</File>
 			<File
 				RelativePath="..\..\lib\VMCore\Constants.cpp">
@@ -149,7 +149,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Performing TableGen Step"
-						CommandLine="..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
+						CommandLine="echo Building $(InputFileName) code emitter with tblgen
+..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
 "
 						AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
 						Outputs="$(SolutionDir)llvm\intrinsics.gen"/>
@@ -159,7 +160,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Performing TableGen Step"
-						CommandLine="..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
+						CommandLine="echo Building $(InputFileName) code emitter with tblgen
+..\$(IntDir)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
 "
 						AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
 						Outputs="$(SolutionDir)llvm\intrinsics.gen"/>
@@ -184,9 +186,6 @@
 				RelativePath="..\..\lib\VMCore\PassManager.cpp">
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\SymbolTable.cpp">
-			</File>
-			<File
 				RelativePath="..\..\lib\VMCore\Type.cpp">
 			</File>
 			<File
@@ -228,7 +227,7 @@
 				RelativePath="..\..\include\llvm\Constant.h">
 			</File>
 			<File
-				RelativePath="..\..\lib\VMCore\ConstantFolding.h">
+				RelativePath="..\..\lib\VMCore\ConstantFold.h">
 			</File>
 			<File
 				RelativePath="..\..\include\llvm\Constants.h">
@@ -300,9 +299,6 @@
 				RelativePath="..\..\include\llvm\Assembly\PrintModulePass.h">
 			</File>
 			<File
-				RelativePath="..\..\include\llvm\SymbolTable.h">
-			</File>
-			<File
 				RelativePath="..\..\include\llvm\SymbolTableListTraits.h">
 			</File>
 			<File
diff --git a/win32/x86/x86.vcproj b/win32/x86/x86.vcproj
index 088d785..b002488 100644
--- a/win32/x86/x86.vcproj
+++ b/win32/x86/x86.vcproj
@@ -116,36 +116,58 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Performing TableGen Step"
-						CommandLine="..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
+						CommandLine="echo Building $(InputFileName) register names with tblgen
+..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
+echo Building $(InputFileName) register information header with tblgen
 ..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc
+echo Building $(InputFileName) register information implementation with tblgen
 ..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc
+echo Building $(InputFileName) instruction names with tblgen
 ..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc
+echo Building $(InputFileName) instruction information with tblgen
 ..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc
+echo Building $(InputFileName) assembly writer with tblgen
 ..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc
+echo Building $(InputFileName) assembly writer #1 with tblgen
 ..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc
+echo Building $(InputFileName) instruction selector implementation with tblgen
 ..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc
+echo Building $(InputFileName) subtarget information with tblgen
 ..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc
+echo Building $(InputFileName) calling convention information with tblgen
+..\$(IntDir)\TableGen.exe -gen-callingconv -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenCallingConv.inc
 "
-						AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
-						Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc"/>
+						AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)X86CallingConv.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
+						Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc;X86GenCallingConv.inc"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Performing TableGen Step"
-						CommandLine="..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
+						CommandLine="echo Building $(InputFileName) register names with tblgen
+..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
+echo Building $(InputFileName) register information header with tblgen
 ..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc
+echo Building $(InputFileName) register information implementation with tblgen
 ..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc
+echo Building $(InputFileName) instruction names with tblgen
 ..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc
+echo Building $(InputFileName) instruction information with tblgen
 ..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc
+echo Building $(InputFileName) assembly writer with tblgen
 ..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc
+echo Building $(InputFileName) assembly writer #1 with tblgen
 ..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc
+echo Building $(InputFileName) instruction selector implementation with tblgen
 ..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc
+echo Building $(InputFileName) subtarget information with tblgen
 ..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc
+echo Building $(InputFileName) calling convention information with tblgen
+..\$(IntDir)\TableGen.exe -gen-callingconv -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenCallingConv.inc
 "
-						AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
-						Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc"/>
+						AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)X86CallingConv.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
+						Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc;X86GenCallingConv.inc"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -158,7 +180,13 @@
 				RelativePath="..\..\lib\Target\X86\X86CodeEmitter.cpp">
 			</File>
 			<File
-				RelativePath="..\..\lib\Target\X86\X86ELFWriter.cpp">
+				RelativePath="..\..\lib\Target\X86\X86COFF.h">
+			</File>
+			<File
+				RelativePath="..\..\lib\Target\X86\X86ELFWriterInfo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\lib\Target\X86\X86ELFWriterInfo.h">
 			</File>
 			<File
 				RelativePath="..\..\lib\Target\X86\X86FloatingPoint.cpp">
@@ -214,6 +242,9 @@
 				RelativePath="..\..\lib\Target\X86\X86ATTAsmPrinter.h">
 			</File>
 			<File
+				RelativePath="..\..\lib\Target\X86\X86CallingConv.td">
+			</File>
+			<File
 				RelativePath="..\..\lib\Target\X86\X86InstrBuilder.h">
 			</File>
 			<File