summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp10
-rw-r--r--lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp2
-rw-r--r--lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp6
-rw-r--r--win32/x86/x86.vcproj12
4 files changed, 15 insertions, 15 deletions
diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
index d154aafc57..7c03f9da36 100644
--- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
+++ b/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/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
index ad4d12fcc8..d616accbc3 100644
--- a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
+++ b/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/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
index 75812f3440..1822c1f914 100644
--- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
+++ b/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/win32/x86/x86.vcproj b/win32/x86/x86.vcproj
index 57cd1b7948..3eea978a5a 100644
--- a/win32/x86/x86.vcproj
+++ b/win32/x86/x86.vcproj
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;..\..\include;.."
+ AdditionalIncludeDirectories=".;..\..\include;..;..\..\lib\Target\X86"
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"
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;..\..\include;.."
+ AdditionalIncludeDirectories=".;..\..\include;..;..\..\lib\Target\X86"
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"
@@ -566,10 +566,6 @@
Name="Generated Tablegen Files"
>
<File
- RelativePath=".\X86GenFastISel.inc"
- >
- </File>
- <File
RelativePath=".\X86GenAsmWriter.inc"
>
</File>
@@ -582,6 +578,10 @@
>
</File>
<File
+ RelativePath=".\X86GenFastISel.inc"
+ >
+ </File>
+ <File
RelativePath=".\X86GenInstrInfo.inc"
>
</File>