diff --git a/llvm/include/llvm/Support/Streams.h b/llvm/include/llvm/Support/Streams.h
index 2444d5b6af35f28d8f6f153973531c508cccb5c4..e9208644da4a043b995d0e7a7d16600207d0f0bb 100644
--- a/llvm/include/llvm/Support/Streams.h
+++ b/llvm/include/llvm/Support/Streams.h
@@ -37,6 +37,11 @@ namespace llvm {
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;
diff --git a/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
index 8a6b60425ec7056352f1653b70d69a2110227d8c..575762e623f22e40f04beea22ddd75b057b91182 100644
--- a/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
+++ b/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
@@ -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"
diff --git a/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h b/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h
index f9479fd41d47563107384c1df3829dd11f4a2425..235c72efaee6615246132f93523b52670dcf12cb 100644
--- a/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h
+++ b/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h
@@ -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"
diff --git a/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp b/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
index 8144ee85a9e79284f081dff2c55af52fdc1053cf..9b69264761b2b91c0ad3452ad48096fd727bfc77 100644
--- a/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
+++ b/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
@@ -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
diff --git a/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp b/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
index 1822c1f914a42eed9c820761a7251187532d5998..75812f344062ece2791f5c706c9514f98e285ffd 100644
--- a/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
+++ b/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
@@ -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"
diff --git a/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h b/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
index c9ca072baf5e6fe919a3b32dc6814c7f6ac2bbad..faf26bd0090f38fba9ebf888eff2bdaf19a20847 100644
--- a/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
+++ b/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
@@ -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"
diff --git a/llvm/win32/Analysis/Analysis.vcproj b/llvm/win32/Analysis/Analysis.vcproj
index 5398ae5f8d6d995392c49d49010efbe897c7105d..5da06bed6cadccedbaad5e07b649e59abc2b2aad 100644
--- a/llvm/win32/Analysis/Analysis.vcproj
+++ b/llvm/win32/Analysis/Analysis.vcproj
@@ -360,10 +360,6 @@
RelativePath="..\..\lib\Analysis\LibCallSemantics.cpp"
>
-
-
@@ -412,10 +408,6 @@
RelativePath="..\..\lib\Analysis\Trace.cpp"
>
-
-
diff --git a/llvm/win32/CodeGen/CodeGen.vcproj b/llvm/win32/CodeGen/CodeGen.vcproj
index 10aa2d8c34fe42b38d23f80802931ccc0d7a5e9c..ac797efc15c753a84651cde973d07e3ddc47e77a 100644
--- a/llvm/win32/CodeGen/CodeGen.vcproj
+++ b/llvm/win32/CodeGen/CodeGen.vcproj
@@ -304,36 +304,32 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/llvm/win32/TableGen/TableGen.vcproj b/llvm/win32/TableGen/TableGen.vcproj
index aef3018aabd538556a24f038432edefcbeb47ec7..913462b54de97aa4a44c767736bcb3aabc051336 100644
--- a/llvm/win32/TableGen/TableGen.vcproj
+++ b/llvm/win32/TableGen/TableGen.vcproj
@@ -1,7 +1,7 @@
+
+
@@ -483,6 +487,10 @@
RelativePath="..\..\utils\TableGen\DAGISelEmitter.h"
>
+
+
diff --git a/llvm/win32/Transforms/Transforms.vcproj b/llvm/win32/Transforms/Transforms.vcproj
index 6ed3766781eec9efaa05eeaf3ab90a2f46b8d16b..ef57d430b11ac81bac3b2f078afe45d6ef4bbcd3 100644
--- a/llvm/win32/Transforms/Transforms.vcproj
+++ b/llvm/win32/Transforms/Transforms.vcproj
@@ -443,10 +443,6 @@
RelativePath="..\..\lib\Transforms\Scalar\DeadStoreElimination.cpp"
>
-
-
diff --git a/llvm/win32/clang.sln b/llvm/win32/clang.sln
index d6cc44ff5a4624caf2f489f9b173f894b8f15452..b1257fdb73ce4c58cc914284e022c637d02f5263 100644
--- a/llvm/win32/clang.sln
+++ b/llvm/win32/clang.sln
@@ -61,10 +61,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Analysis", "Analysis\Analys
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 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangCodeGen", "..\tools\cl
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 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangDriver", "..\tools\cla
{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}"
diff --git a/llvm/win32/x86/x86.vcproj b/llvm/win32/x86/x86.vcproj
index 7001947b8127dcdbc74b48a4b802dae868dd321b..78801743eee47a25c147bdc1558b8dc1e6d500ea 100644
--- a/llvm/win32/x86/x86.vcproj
+++ b/llvm/win32/x86/x86.vcproj
@@ -90,7 +90,7 @@
/>
-
-
-
-
@@ -415,10 +407,6 @@
RelativePath="..\..\lib\Target\X86\X86InstrX86-64.td"
>
-
-
@@ -447,6 +435,34 @@
RelativePath="..\..\lib\Target\X86\X86TargetMachine.cpp"
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+