Adjust to changes in asmwriter filenames


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18987 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/Makefile b/lib/Target/X86/Makefile
index 87115ea..423f1bf 100644
--- a/lib/Target/X86/Makefile
+++ b/lib/Target/X86/Makefile
@@ -12,8 +12,8 @@
 # Make sure that tblgen is run, first thing.
 BUILT_SOURCES = X86GenRegisterInfo.h.inc X86GenRegisterNames.inc \
                 X86GenRegisterInfo.inc X86GenInstrNames.inc \
-                X86GenInstrInfo.inc X86GenATTAsmWriter.inc \
-                X86GenIntelAsmWriter.inc
+                X86GenInstrInfo.inc X86GenAsmWriter.inc \
+                X86GenAsmWriter1.inc
 
 include $(LEVEL)/Makefile.common
 
diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp
index 32e8041..f91a170 100644
--- a/lib/Target/X86/X86AsmPrinter.cpp
+++ b/lib/Target/X86/X86AsmPrinter.cpp
@@ -222,7 +222,7 @@
 
 
 // Include the auto-generated portion of the assembly writer.
-#include "X86GenIntelAsmWriter.inc"
+#include "X86GenAsmWriter1.inc"
 
 
 /// runOnMachineFunction - This uses the printMachineInstruction()
@@ -445,7 +445,7 @@
 
 
 // Include the auto-generated portion of the assembly writer.
-#include "X86GenATTAsmWriter.inc"
+#include "X86GenAsmWriter.inc"
 
 
 /// runOnMachineFunction - This uses the printMachineInstruction()