IFC @ r224187

61 files changed, 228 insertions, 128 deletions

diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index 212c7c8b..abcc113 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -2,6 +2,7 @@
 
 .if !make(install)
 SUBDIR=	libclanganalysis \
+	libclangarcmigrate \
 	libclangast \
 	libclangbasic \
 	libclangcodegen \
@@ -39,16 +40,21 @@ SUBDIR=	libclanganalysis \
 	\
 	libllvmarmasmparser \
 	libllvmarmcodegen \
+	libllvmarmdesc \
 	libllvmarmdisassembler \
 	libllvmarminfo \
 	libllvmarminstprinter \
 	libllvmmipscodegen \
+	libllvmmipsdesc \
 	libllvmmipsinfo \
+	libllvmmipsinstprinter \
 	libllvmpowerpccodegen \
+	libllvmpowerpcdesc \
 	libllvmpowerpcinfo \
 	libllvmpowerpcinstprinter \
 	libllvmx86asmparser \
 	libllvmx86codegen \
+	libllvmx86desc \
 	libllvmx86disassembler \
 	libllvmx86info \
 	libllvmx86instprinter \
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index f443f1d..17b47c3 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -34,11 +34,12 @@ CFLAGS+=-DCLANG_PREFIX=\"${TOOLS_PREFIX}\"
 
 .PATH:	${LLVM_SRCS}/${SRCDIR}
 
-TBLGEN=tblgen ${CFLAGS:M-I*}
+TBLGEN?=tblgen
+TBLINC+=-I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target
 
 Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/Intrinsics.td
-	${TBLGEN} -gen-intrinsic \
-	    ${LLVM_SRCS}/include/llvm/Intrinsics.td > ${.TARGET}
+	${TBLGEN} -I ${LLVM_SRCS}/lib/VMCore ${TBLINC} -gen-intrinsic \
+	    -o ${.TARGET} ${LLVM_SRCS}/include/llvm/Intrinsics.td
 .for arch in \
 	ARM/ARM Mips/Mips PowerPC/PPC X86/X86
 . for hdr in \
@@ -51,79 +52,97 @@ Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/Intrinsics.td
 	DisassemblerTables/-gen-disassembler \
 	EDInfo/-gen-enhanced-disassembly-info \
 	FastISel/-gen-fast-isel \
-	InstrInfo/-gen-instr-desc \
-	InstrNames/-gen-instr-enums \
+	InstrInfo/-gen-instr-info \
 	MCCodeEmitter/-gen-emitter,-mc-emitter \
-	RegisterInfo.h/-gen-register-desc-header \
-	RegisterInfo/-gen-register-desc \
-	RegisterNames/-gen-register-enums \
-	Subtarget/-gen-subtarget
+	MCPseudoLowering/-gen-pseudo-lowering \
+	RegisterInfo/-gen-register-info \
+	SubtargetInfo/-gen-subtarget
 ${arch:T}Gen${hdr:H:C/$/.inc.h/}: ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
-	${TBLGEN} ${hdr:T:C/,/ /g} \
-	    ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td > ${.TARGET}
+	${TBLGEN} -I ${LLVM_SRCS}/lib/Target/${arch:H} ${TBLINC} \
+	    ${hdr:T:C/,/ /g} -o ${.TARGET} \
+	    ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
 . endfor
 .endfor
 
 ARMGenDecoderTables.inc.h: ${LLVM_SRCS}/lib/Target/ARM/ARM.td
-	${TBLGEN} -gen-arm-decoder ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${LLVM_SRCS}/lib/Target/ARM ${TBLINC} \
+	    -gen-arm-decoder -o ${.TARGET} ${.ALLSRC}
 
 Attrs.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${TBLGEN} -gen-clang-attr-classes ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/AST ${TBLINC} \
+	    -gen-clang-attr-classes -o ${.TARGET} \
+	    -I ${CLANG_SRCS}/include ${.ALLSRC}
 
 AttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${TBLGEN} -gen-clang-attr-impl ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/AST ${TBLINC} \
+	    -gen-clang-attr-impl -o ${.TARGET} \
+	    -I ${CLANG_SRCS}/include ${.ALLSRC}
 
 AttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${TBLGEN} -gen-clang-attr-list ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/Basic ${TBLINC} \
+	    -gen-clang-attr-list -o ${.TARGET} \
+	    -I ${CLANG_SRCS}/include ${.ALLSRC}
 
 AttrPCHRead.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${TBLGEN} -gen-clang-attr-pch-read ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/Serialization \
+	    ${TBLINC} -gen-clang-attr-pch-read -o ${.TARGET} \
+	    -I ${CLANG_SRCS}/include ${.ALLSRC}
 
 AttrPCHWrite.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${TBLGEN} -gen-clang-attr-pch-write ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/Serialization \
+	    ${TBLINC} -gen-clang-attr-pch-write -o ${.TARGET} \
+	    -I ${CLANG_SRCS}/include ${.ALLSRC}
 
 AttrSpellings.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${TBLGEN} -gen-clang-attr-spelling-list ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/Lex ${TBLINC} \
+	    -gen-clang-attr-spelling-list -o ${.TARGET} \
+	    -I ${CLANG_SRCS}/include ${.ALLSRC}
 
 DeclNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
-	${TBLGEN} -gen-clang-decl-nodes ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/AST ${TBLINC} \
+	    -gen-clang-decl-nodes -o ${.TARGET} ${.ALLSRC}
 
 StmtNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td
-	${TBLGEN} -gen-clang-stmt-nodes ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/AST ${TBLINC} \
+	    -gen-clang-stmt-nodes -o ${.TARGET} ${.ALLSRC}
 
 arm_neon.inc.h: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
-	${TBLGEN} -gen-arm-neon-sema ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/Basic ${TBLINC} \
+	    -gen-arm-neon-sema -o ${.TARGET} ${.ALLSRC}
 
 DiagnosticGroups.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
-	${TBLGEN} -gen-clang-diag-groups -I${CLANG_SRCS}/include/clang/Basic \
-	    ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/Basic ${TBLINC} \
+	    -gen-clang-diag-groups -o ${.TARGET} ${.ALLSRC}
 
 DiagnosticIndexName.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
-	${TBLGEN} -gen-clang-diags-index-name \
-	    -I${CLANG_SRCS}/include/clang/Basic ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/Basic ${TBLINC} \
+	    -gen-clang-diags-index-name -o ${.TARGET} ${.ALLSRC}
 
 .for hdr in AST Analysis Common Driver Frontend Lex Parse Sema
 Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
-	${TBLGEN} -gen-clang-diags-defs -clang-component=${hdr} \
-	    -I${CLANG_SRCS}/include/clang/Basic ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/Basic ${TBLINC} \
+	    -gen-clang-diags-defs -clang-component=${hdr} \
+	    -o ${.TARGET} ${.ALLSRC}
 .endfor
 
 Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/Options.td
-	${TBLGEN} -gen-opt-parser-defs -I${CLANG_SRCS}/include/clang/Driver \
-	    ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/Driver ${TBLINC} \
+	    -gen-opt-parser-defs -o ${.TARGET} ${.ALLSRC}
 
 CC1Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/CC1Options.td
-	${TBLGEN} -gen-opt-parser-defs -I${CLANG_SRCS}/include/clang/Driver \
-	    ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/Driver ${TBLINC} \
+	    -gen-opt-parser-defs -o ${.TARGET} ${.ALLSRC}
 
 CC1AsOptions.inc.h: ${CLANG_SRCS}/include/clang/Driver/CC1AsOptions.td
-	${TBLGEN} -gen-opt-parser-defs -I${CLANG_SRCS}/include/clang/Driver \
-	    ${.ALLSRC} > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/include/clang/Driver ${TBLINC} \
+	    -gen-opt-parser-defs -o ${.TARGET} ${.ALLSRC}
 
 Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td \
 	    ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/CheckerBase.td
-	${TBLGEN} -gen-clang-sa-checkers -I${CLANG_SRCS}/include \
-	    ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td > ${.TARGET}
+	${TBLGEN} -I ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers \
+	    ${TBLINC} -gen-clang-sa-checkers -o ${.TARGET} \
+	    -I ${CLANG_SRCS}/include \
+	    ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
 
 SRCS+=		${TGHDRS:C/$/.inc.h/}
 DPADD+=		${TGHDRS:C/$/.inc.h/}
diff --git a/lib/clang/include/ARMGenInstrNames.inc b/lib/clang/include/ARMGenInstrNames.inc
deleted file mode 100644
index 9ecc271..0000000
--- a/lib/clang/include/ARMGenInstrNames.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenInstrNames.inc.h"
diff --git a/lib/clang/include/ARMGenMCPseudoLowering.inc b/lib/clang/include/ARMGenMCPseudoLowering.inc
new file mode 100644
index 0000000..aa3b617
--- /dev/null
+++ b/lib/clang/include/ARMGenMCPseudoLowering.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "ARMGenMCPseudoLowering.inc.h"
diff --git a/lib/clang/include/ARMGenRegisterInfo.h.inc b/lib/clang/include/ARMGenRegisterInfo.h.inc
deleted file mode 100644
index 03bd3a2..0000000
--- a/lib/clang/include/ARMGenRegisterInfo.h.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenRegisterInfo.h.inc.h"
diff --git a/lib/clang/include/ARMGenRegisterNames.inc b/lib/clang/include/ARMGenRegisterNames.inc
deleted file mode 100644
index 7eb6a0d..0000000
--- a/lib/clang/include/ARMGenRegisterNames.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenRegisterNames.inc.h"
diff --git a/lib/clang/include/ARMGenSubtarget.inc b/lib/clang/include/ARMGenSubtarget.inc
deleted file mode 100644
index 55d5e8e..0000000
--- a/lib/clang/include/ARMGenSubtarget.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenSubtarget.inc.h"
diff --git a/lib/clang/include/ARMGenSubtargetInfo.inc b/lib/clang/include/ARMGenSubtargetInfo.inc
new file mode 100644
index 0000000..6579d9f
--- /dev/null
+++ b/lib/clang/include/ARMGenSubtargetInfo.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "ARMGenSubtargetInfo.inc.h"
diff --git a/lib/clang/include/IA64GenInstrNames.inc b/lib/clang/include/IA64GenInstrNames.inc
deleted file mode 100644
index 6b2c58e..0000000
--- a/lib/clang/include/IA64GenInstrNames.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "IA64GenInstrNames.inc.h"
diff --git a/lib/clang/include/IA64GenRegisterInfo.h.inc b/lib/clang/include/IA64GenRegisterInfo.h.inc
deleted file mode 100644
index 38086d4..0000000
--- a/lib/clang/include/IA64GenRegisterInfo.h.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "IA64GenRegisterInfo.h.inc.h"
diff --git a/lib/clang/include/IA64GenRegisterNames.inc b/lib/clang/include/IA64GenRegisterNames.inc
deleted file mode 100644
index d1f0970..0000000
--- a/lib/clang/include/IA64GenRegisterNames.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "IA64GenRegisterNames.inc.h"
diff --git a/lib/clang/include/MipsGenInstrNames.inc b/lib/clang/include/MipsGenInstrNames.inc
deleted file mode 100644
index 78759ee..0000000
--- a/lib/clang/include/MipsGenInstrNames.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenInstrNames.inc.h"
diff --git a/lib/clang/include/MipsGenRegisterInfo.h.inc b/lib/clang/include/MipsGenRegisterInfo.h.inc
deleted file mode 100644
index af66c5f..0000000
--- a/lib/clang/include/MipsGenRegisterInfo.h.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenRegisterInfo.h.inc.h"
diff --git a/lib/clang/include/MipsGenRegisterNames.inc b/lib/clang/include/MipsGenRegisterNames.inc
deleted file mode 100644
index 3b00971..0000000
--- a/lib/clang/include/MipsGenRegisterNames.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenRegisterNames.inc.h"
diff --git a/lib/clang/include/MipsGenSubtarget.inc b/lib/clang/include/MipsGenSubtarget.inc
deleted file mode 100644
index 9fb4a70..0000000
--- a/lib/clang/include/MipsGenSubtarget.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenSubtarget.inc.h"
diff --git a/lib/clang/include/MipsGenSubtargetInfo.inc b/lib/clang/include/MipsGenSubtargetInfo.inc
new file mode 100644
index 0000000..2c069f4
--- /dev/null
+++ b/lib/clang/include/MipsGenSubtargetInfo.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "MipsGenSubtargetInfo.inc.h"
diff --git a/lib/clang/include/PPCGenInstrNames.inc b/lib/clang/include/PPCGenInstrNames.inc
deleted file mode 100644
index 67ae90d..0000000
--- a/lib/clang/include/PPCGenInstrNames.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenInstrNames.inc.h"
diff --git a/lib/clang/include/PPCGenRegisterInfo.h.inc b/lib/clang/include/PPCGenRegisterInfo.h.inc
deleted file mode 100644
index bce5f45..0000000
--- a/lib/clang/include/PPCGenRegisterInfo.h.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenRegisterInfo.h.inc.h"
diff --git a/lib/clang/include/PPCGenRegisterNames.inc b/lib/clang/include/PPCGenRegisterNames.inc
deleted file mode 100644
index 09e7a2d..0000000
--- a/lib/clang/include/PPCGenRegisterNames.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenRegisterNames.inc.h"
diff --git a/lib/clang/include/PPCGenSubtarget.inc b/lib/clang/include/PPCGenSubtarget.inc
deleted file mode 100644
index 7032e52..0000000
--- a/lib/clang/include/PPCGenSubtarget.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenSubtarget.inc.h"
diff --git a/lib/clang/include/PPCGenSubtargetInfo.inc b/lib/clang/include/PPCGenSubtargetInfo.inc
new file mode 100644
index 0000000..a348630
--- /dev/null
+++ b/lib/clang/include/PPCGenSubtargetInfo.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "PPCGenSubtargetInfo.inc.h"
diff --git a/lib/clang/include/X86GenInstrNames.inc b/lib/clang/include/X86GenInstrNames.inc
deleted file mode 100644
index 9c856f4..0000000
--- a/lib/clang/include/X86GenInstrNames.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenInstrNames.inc.h"
diff --git a/lib/clang/include/X86GenRegisterInfo.h.inc b/lib/clang/include/X86GenRegisterInfo.h.inc
deleted file mode 100644
index 4a76e0d..0000000
--- a/lib/clang/include/X86GenRegisterInfo.h.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenRegisterInfo.h.inc.h"
diff --git a/lib/clang/include/X86GenRegisterNames.inc b/lib/clang/include/X86GenRegisterNames.inc
deleted file mode 100644
index ad3d722..0000000
--- a/lib/clang/include/X86GenRegisterNames.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenRegisterNames.inc.h"
diff --git a/lib/clang/include/X86GenSubtarget.inc b/lib/clang/include/X86GenSubtarget.inc
deleted file mode 100644
index 1e8907d..0000000
--- a/lib/clang/include/X86GenSubtarget.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenSubtarget.inc.h"
diff --git a/lib/clang/include/X86GenSubtargetInfo.inc b/lib/clang/include/X86GenSubtargetInfo.inc
new file mode 100644
index 0000000..a64b3a4
--- /dev/null
+++ b/lib/clang/include/X86GenSubtargetInfo.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "X86GenSubtargetInfo.inc.h"
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index 144a920..3e3b44c 100644
--- a/lib/clang/include/clang/Basic/Version.inc
+++ b/lib/clang/include/clang/Basic/Version.inc
@@ -5,6 +5,6 @@
 #define	CLANG_VERSION_MINOR	0
 
 #define	CLANG_VENDOR		"FreeBSD "
-#define	CLANG_VENDOR_SUFFIX	" 20110612"
+#define	CLANG_VENDOR_SUFFIX	" 20110717"
 
-#define	SVN_REVISION		"132879"
+#define	SVN_REVISION		"135360"
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index 229b705..f264571 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -569,9 +569,15 @@
 /* LLVM architecture name for the native architecture, if available */
 #define LLVM_NATIVE_ARCH X86
 
+/* LLVM name for the native AsmParser init function, if available */
+#define LLVM_NATIVE_ASMPARSER LLVMInitializeX86AsmParser
+
 /* LLVM name for the native AsmPrinter init function, if available */
 #define LLVM_NATIVE_ASMPRINTER LLVMInitializeX86AsmPrinter
 
+/* LLVM name for the native MCAsmInfo init function, if available */
+#define LLVM_NATIVE_MCASMINFO LLVMInitializeX86MCAsmInfo
+
 /* LLVM name for the native Target init function, if available */
 #define LLVM_NATIVE_TARGET LLVMInitializeX86Target
 
@@ -674,6 +680,9 @@
 /* Define if use udis86 library */
 #define USE_UDIS86 0
 
+/* Type of 1st arg on ELM Callback */
+/* #undef WIN32_ELMCB_PCSTR */
+
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index fc3ec97..e76d10f 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -60,9 +60,15 @@
 /* LLVM name for the native TargetInfo init function, if available */
 #define LLVM_NATIVE_TARGETINFO LLVMInitializeX86TargetInfo
 
+/* LLVM name for the native MCAsmInfo init function, if available */
+#define LLVM_NATIVE_MCASMINFO LLVMInitializeX86MCAsmInfo
+
 /* LLVM name for the native AsmPrinter init function, if available */
 #define LLVM_NATIVE_ASMPRINTER LLVMInitializeX86AsmPrinter
 
+/* LLVM name for the native AsmPrinter init function, if available */
+#define LLVM_NATIVE_ASMPARSER LLVMInitializeX86AsmParser
+
 /* Define if this is Unixish platform */
 #define LLVM_ON_UNIX 1
 
diff --git a/lib/clang/libclangarcmigrate/Makefile b/lib/clang/libclangarcmigrate/Makefile
new file mode 100644
index 0000000..c1e4511
--- /dev/null
+++ b/lib/clang/libclangarcmigrate/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+LIB=	clangarcmigrate
+
+SRCDIR=	tools/clang/lib/ARCMigrate
+SRCS=	ARCMT.cpp \
+	ARCMTActions.cpp \
+	FileRemapper.cpp \
+	TransARCAssign.cpp \
+	TransAutoreleasePool.cpp \
+	TransBlockObjCVariable.cpp \
+	TransEmptyStatementsAndDealloc.cpp \
+	TransformActions.cpp \
+	Transforms.cpp \
+	TransProperties.cpp \
+	TransRetainReleaseDealloc.cpp \
+	TransUnbridgedCasts.cpp \
+	TransUnusedInitDelegate.cpp \
+	TransZeroOutPropsInDealloc.cpp
+
+TGHDRS=	AttrList \
+	Attrs \
+	DeclNodes \
+	DiagnosticCommonKinds \
+	DiagnosticGroups \
+	DiagnosticSemaKinds \
+	StmtNodes
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libclangfrontend/Makefile b/lib/clang/libclangfrontend/Makefile
index ff32c08..2087900 100644
--- a/lib/clang/libclangfrontend/Makefile
+++ b/lib/clang/libclangfrontend/Makefile
@@ -6,7 +6,6 @@ SRCDIR=	tools/clang/lib/Frontend
 SRCS=	ASTConsumers.cpp \
 	ASTMerge.cpp \
 	ASTUnit.cpp \
-	BoostConAction.cpp \
 	CacheTokens.cpp \
 	CompilerInstance.cpp \
 	CompilerInvocation.cpp \
diff --git a/lib/clang/libclangsema/Makefile b/lib/clang/libclangsema/Makefile
index d2c7e34..3c03773 100644
--- a/lib/clang/libclangsema/Makefile
+++ b/lib/clang/libclangsema/Makefile
@@ -21,6 +21,7 @@ SRCS=	AnalysisBasedWarnings.cpp \
 	SemaDecl.cpp \
 	SemaDeclAttr.cpp \
 	SemaDeclCXX.cpp \
+	SemaExprMember.cpp \
 	SemaDeclObjC.cpp \
 	SemaExceptionSpec.cpp \
 	SemaExpr.cpp \
diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile
index 5436631..2b0bccf 100644
--- a/lib/clang/libllvmanalysis/Makefile
+++ b/lib/clang/libllvmanalysis/Makefile
@@ -10,6 +10,7 @@ SRCS=	AliasAnalysis.cpp \
 	AliasSetTracker.cpp \
 	Analysis.cpp \
 	BasicAliasAnalysis.cpp \
+	BranchProbabilityInfo.cpp \
 	CFGPrinter.cpp \
 	CaptureTracking.cpp \
 	ConstantFolding.cpp \
diff --git a/lib/clang/libllvmarmasmparser/Makefile b/lib/clang/libllvmarmasmparser/Makefile
index 95dfc5b..c3d0d89 100644
--- a/lib/clang/libllvmarmasmparser/Makefile
+++ b/lib/clang/libllvmarmasmparser/Makefile
@@ -8,8 +8,8 @@ SRCS=	ARMAsmLexer.cpp \
 	ARMAsmParser.cpp
 
 TGHDRS=	ARMGenAsmMatcher \
-	ARMGenInstrNames \
-	ARMGenRegisterInfo.h \
-	ARMGenRegisterNames
+	ARMGenInstrInfo \
+	ARMGenRegisterInfo \
+	ARMGenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarmcodegen/Makefile b/lib/clang/libllvmarmcodegen/Makefile
index c19a451..0110781 100644
--- a/lib/clang/libllvmarmcodegen/Makefile
+++ b/lib/clang/libllvmarmcodegen/Makefile
@@ -20,11 +20,11 @@ SRCS=	ARMAsmBackend.cpp \
 	ARMISelLowering.cpp \
 	ARMInstrInfo.cpp \
 	ARMJITInfo.cpp \
+	ARMLoadStoreOptimizer.cpp \
 	ARMMCCodeEmitter.cpp \
 	ARMMCExpr.cpp \
-	ARMLoadStoreOptimizer.cpp \
-	ARMMCAsmInfo.cpp \
 	ARMMCInstLower.cpp \
+	ARMMachObjectWriter.cpp \
 	ARMRegisterInfo.cpp \
 	ARMSelectionDAGInfo.cpp \
 	ARMSubtarget.cpp \
@@ -46,12 +46,10 @@ TGHDRS=	ARMGenAsmWriter \
 	ARMGenDAGISel \
 	ARMGenFastISel \
 	ARMGenInstrInfo \
-	ARMGenInstrNames \
 	ARMGenMCCodeEmitter \
+	ARMGenMCPseudoLowering \
 	ARMGenRegisterInfo \
-	ARMGenRegisterInfo.h \
-	ARMGenRegisterNames \
-	ARMGenSubtarget \
+	ARMGenSubtargetInfo \
 	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarmdesc/Makefile b/lib/clang/libllvmarmdesc/Makefile
new file mode 100644
index 0000000..0074ec2
--- /dev/null
+++ b/lib/clang/libllvmarmdesc/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+LIB=	llvmarmdesc
+
+SRCDIR=	lib/Target/ARM/MCTargetDesc
+SRCS=	ARMMCAsmInfo.cpp \
+	ARMMCTargetDesc.cpp
+
+TGHDRS=	ARMGenInstrInfo \
+	ARMGenRegisterInfo \
+	ARMGenSubtargetInfo
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarmdisassembler/Makefile b/lib/clang/libllvmarmdisassembler/Makefile
index c824560..c0648bb 100644
--- a/lib/clang/libllvmarmdisassembler/Makefile
+++ b/lib/clang/libllvmarmdisassembler/Makefile
@@ -9,8 +9,7 @@ SRCS=	ARMDisassemblerCore.cpp
 TGHDRS=	ARMGenDecoderTables \
 	ARMGenEDInfo \
 	ARMGenInstrInfo \
-	ARMGenInstrNames \
-	ARMGenRegisterInfo.h \
-	ARMGenRegisterNames
+	ARMGenRegisterInfo \
+	ARMGenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarminfo/Makefile b/lib/clang/libllvmarminfo/Makefile
index 2f17454..43b9f83 100644
--- a/lib/clang/libllvmarminfo/Makefile
+++ b/lib/clang/libllvmarminfo/Makefile
@@ -6,7 +6,8 @@ SRCDIR=	lib/Target/ARM/TargetInfo/
 INCDIR=	lib/Target/ARM
 SRCS=	ARMTargetInfo.cpp
 
-TGHDRS=	ARMGenInstrNames \
-	ARMGenRegisterNames
+TGHDRS=	ARMGenInstrInfo \
+	ARMGenRegisterInfo \
+	ARMGenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarminstprinter/Makefile b/lib/clang/libllvmarminstprinter/Makefile
index 630f12a..ca7e7d4 100644
--- a/lib/clang/libllvmarminstprinter/Makefile
+++ b/lib/clang/libllvmarminstprinter/Makefile
@@ -7,7 +7,8 @@ INCDIR=	lib/Target/ARM
 SRCS=	ARMInstPrinter.cpp
 
 TGHDRS=	ARMGenAsmWriter \
-	ARMGenInstrNames \
-	ARMGenRegisterNames
+	ARMGenInstrInfo \
+	ARMGenRegisterInfo \
+	ARMGenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmcodegen/Makefile b/lib/clang/libllvmcodegen/Makefile
index c657316..702c476 100644
--- a/lib/clang/libllvmcodegen/Makefile
+++ b/lib/clang/libllvmcodegen/Makefile
@@ -62,7 +62,6 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	Passes.cpp \
 	PeepholeOptimizer.cpp \
 	PostRASchedulerList.cpp \
-	PreAllocSplitting.cpp \
 	ProcessImplicitDefs.cpp \
 	PrologEpilogInserter.cpp \
 	PseudoSourceValue.cpp \
@@ -82,7 +81,6 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	ScoreboardHazardRecognizer.cpp \
 	ShadowStackGC.cpp \
 	ShrinkWrapping.cpp \
-	SimpleRegisterCoalescing.cpp \
 	SjLjEHPrepare.cpp \
 	SlotIndexes.cpp \
 	Spiller.cpp \
diff --git a/lib/clang/libllvmcore/Makefile b/lib/clang/libllvmcore/Makefile
index 4e3adde..c37d45a 100644
--- a/lib/clang/libllvmcore/Makefile
+++ b/lib/clang/libllvmcore/Makefile
@@ -31,7 +31,6 @@ SRCS=	AsmWriter.cpp \
 	PassRegistry.cpp \
 	PrintModulePass.cpp \
 	Type.cpp \
-	TypeSymbolTable.cpp \
 	Use.cpp \
 	User.cpp \
 	Value.cpp \
diff --git a/lib/clang/libllvmipo/Makefile b/lib/clang/libllvmipo/Makefile
index f919dd1..062ba5b 100644
--- a/lib/clang/libllvmipo/Makefile
+++ b/lib/clang/libllvmipo/Makefile
@@ -6,7 +6,6 @@ SRCDIR=	lib/Transforms/IPO
 SRCS=	ArgumentPromotion.cpp \
 	ConstantMerge.cpp \
 	DeadArgumentElimination.cpp \
-	DeadTypeElimination.cpp \
 	ExtractGV.cpp \
 	FunctionAttrs.cpp \
 	GlobalDCE.cpp \
diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile
index 07b91ad..435cdf4 100644
--- a/lib/clang/libllvmmc/Makefile
+++ b/lib/clang/libllvmmc/Makefile
@@ -30,9 +30,11 @@ SRCS=	ELFObjectWriter.cpp \
 	MCSectionELF.cpp \
 	MCSectionMachO.cpp \
 	MCStreamer.cpp \
+	MCSubtargetInfo.cpp \
 	MCSymbol.cpp \
 	MCWin64EH.cpp \
 	MachObjectWriter.cpp \
+	SubtargetFeature.cpp \
 	TargetAsmBackend.cpp \
 	WinCOFFObjectWriter.cpp \
 	WinCOFFStreamer.cpp
diff --git a/lib/clang/libllvmmipscodegen/Makefile b/lib/clang/libllvmmipscodegen/Makefile
index 63e9e0e..1651831 100644
--- a/lib/clang/libllvmmipscodegen/Makefile
+++ b/lib/clang/libllvmmipscodegen/Makefile
@@ -11,7 +11,8 @@ SRCS=	MipsAsmPrinter.cpp \
 	MipsISelDAGToDAG.cpp \
 	MipsISelLowering.cpp \
 	MipsInstrInfo.cpp \
-	MipsMCAsmInfo.cpp \
+	MipsMCInstLower.cpp \
+	MipsMCSymbolRefExpr.cpp \
 	MipsRegisterInfo.cpp \
 	MipsSelectionDAGInfo.cpp \
 	MipsSubtarget.cpp \
@@ -23,10 +24,7 @@ TGHDRS=	Intrinsics \
 	MipsGenCallingConv \
 	MipsGenDAGISel \
 	MipsGenInstrInfo \
-	MipsGenInstrNames \
 	MipsGenRegisterInfo \
-	MipsGenRegisterInfo.h \
-	MipsGenRegisterNames \
-	MipsGenSubtarget
+	MipsGenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmipsdesc/Makefile b/lib/clang/libllvmmipsdesc/Makefile
new file mode 100644
index 0000000..4147209
--- /dev/null
+++ b/lib/clang/libllvmmipsdesc/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+LIB=	llvmmipsdesc
+
+SRCDIR=	lib/Target/Mips/MCTargetDesc
+SRCS=	MipsMCAsmInfo.cpp \
+	MipsMCTargetDesc.cpp
+
+TGHDRS=	MipsGenInstrInfo \
+	MipsGenRegisterInfo \
+	MipsGenSubtargetInfo
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmipsinfo/Makefile b/lib/clang/libllvmmipsinfo/Makefile
index faa6f6f..abf6d8e 100644
--- a/lib/clang/libllvmmipsinfo/Makefile
+++ b/lib/clang/libllvmmipsinfo/Makefile
@@ -6,7 +6,8 @@ SRCDIR=	lib/Target/Mips/TargetInfo/
 INCDIR=	lib/Target/Mips
 SRCS=	MipsTargetInfo.cpp
 
-TGHDRS=	MipsGenRegisterNames \
-	MipsGenInstrNames
+TGHDRS=	MipsGenInstrInfo \
+	MipsGenRegisterInfo \
+	MipsGenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmipsinstprinter/Makefile b/lib/clang/libllvmmipsinstprinter/Makefile
new file mode 100644
index 0000000..357320e
--- /dev/null
+++ b/lib/clang/libllvmmipsinstprinter/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+LIB=	llvmmipsinstprinter
+
+SRCDIR=	lib/Target/Mips/InstPrinter
+INCDIR=	lib/Target/Mips
+SRCS=	MipsInstPrinter.cpp
+
+TGHDRS=	MipsGenAsmWriter \
+	MipsGenInstrInfo \
+	MipsGenRegisterInfo
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpccodegen/Makefile b/lib/clang/libllvmpowerpccodegen/Makefile
index 7d43ae1..08663e8 100644
--- a/lib/clang/libllvmpowerpccodegen/Makefile
+++ b/lib/clang/libllvmpowerpccodegen/Makefile
@@ -13,7 +13,6 @@ SRCS=	PPCAsmBackend.cpp \
 	PPCISelLowering.cpp \
 	PPCInstrInfo.cpp \
 	PPCJITInfo.cpp \
-	PPCMCAsmInfo.cpp \
 	PPCMCCodeEmitter.cpp \
 	PPCMCInstLower.cpp \
 	PPCPredicates.cpp \
@@ -27,11 +26,8 @@ TGHDRS=	Intrinsics \
 	PPCGenCodeEmitter \
 	PPCGenDAGISel \
 	PPCGenInstrInfo \
-	PPCGenInstrNames \
 	PPCGenMCCodeEmitter \
 	PPCGenRegisterInfo \
-	PPCGenRegisterInfo.h \
-	PPCGenRegisterNames \
-	PPCGenSubtarget
+	PPCGenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpcdesc/Makefile b/lib/clang/libllvmpowerpcdesc/Makefile
new file mode 100644
index 0000000..9207da2
--- /dev/null
+++ b/lib/clang/libllvmpowerpcdesc/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+LIB=	llvmpowerpcdesc
+
+SRCDIR=	lib/Target/PowerPC/MCTargetDesc
+SRCS=	PPCMCAsmInfo.cpp \
+	PPCMCTargetDesc.cpp
+
+TGHDRS=	PPCGenInstrInfo \
+	PPCGenRegisterInfo \
+	PPCGenSubtargetInfo
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpcinfo/Makefile b/lib/clang/libllvmpowerpcinfo/Makefile
index 5142ce1..8cdaa5a5 100644
--- a/lib/clang/libllvmpowerpcinfo/Makefile
+++ b/lib/clang/libllvmpowerpcinfo/Makefile
@@ -6,7 +6,8 @@ SRCDIR=	lib/Target/PowerPC/TargetInfo/
 INCDIR=	lib/Target/PowerPC
 SRCS=	PowerPCTargetInfo.cpp
 
-TGHDRS=	PPCGenRegisterNames \
-	PPCGenInstrNames
+TGHDRS=	PPCGenInstrInfo \
+	PPCGenRegisterInfo \
+	PPCGenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpcinstprinter/Makefile b/lib/clang/libllvmpowerpcinstprinter/Makefile
index 8be81c4..c1528ae 100644
--- a/lib/clang/libllvmpowerpcinstprinter/Makefile
+++ b/lib/clang/libllvmpowerpcinstprinter/Makefile
@@ -7,8 +7,8 @@ INCDIR=	lib/Target/PowerPC
 SRCS=	PPCInstPrinter.cpp
 
 TGHDRS=	PPCGenAsmWriter \
-	PPCGenInstrNames \
-	PPCGenRegisterInfo.h \
-	PPCGenRegisterNames
+	PPCGenInstrInfo \
+	PPCGenRegisterInfo \
+	PPCGenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmscalaropts/Makefile b/lib/clang/libllvmscalaropts/Makefile
index 757b8e0..81998a4 100644
--- a/lib/clang/libllvmscalaropts/Makefile
+++ b/lib/clang/libllvmscalaropts/Makefile
@@ -22,6 +22,7 @@ SRCS=	ADCE.cpp \
 	LoopUnrollPass.cpp \
 	LoopUnswitch.cpp \
 	MemCpyOptimizer.cpp \
+	ObjCARC.cpp \
 	Reassociate.cpp \
 	SCCP.cpp \
 	ScalarReplAggregates.cpp \
diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile
index 72f5c57..e1a16c4 100644
--- a/lib/clang/libllvmsupport/Makefile
+++ b/lib/clang/libllvmsupport/Makefile
@@ -8,6 +8,7 @@ SRCS=	APFloat.cpp \
 	APSInt.cpp \
 	Allocator.cpp \
 	Atomic.cpp \
+	BranchProbability.cpp \
 	CommandLine.cpp \
 	ConstantRange.cpp \
 	CrashRecoveryContext.cpp \
diff --git a/lib/clang/libllvmtarget/Makefile b/lib/clang/libllvmtarget/Makefile
index 56544d1..493b7c1 100644
--- a/lib/clang/libllvmtarget/Makefile
+++ b/lib/clang/libllvmtarget/Makefile
@@ -4,7 +4,6 @@ LIB=	llvmtarget
 
 SRCDIR=	lib/Target
 SRCS=	Mangler.cpp \
-	SubtargetFeature.cpp \
 	Target.cpp \
 	TargetAsmInfo.cpp \
 	TargetAsmLexer.cpp \
@@ -16,6 +15,6 @@ SRCS=	Mangler.cpp \
 	TargetLoweringObjectFile.cpp \
 	TargetMachine.cpp \
 	TargetRegisterInfo.cpp \
-	TargetSubtarget.cpp
+	TargetSubtargetInfo.cpp
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmtransformutils/Makefile b/lib/clang/libllvmtransformutils/Makefile
index 0fa0c96..50dae17 100644
--- a/lib/clang/libllvmtransformutils/Makefile
+++ b/lib/clang/libllvmtransformutils/Makefile
@@ -9,7 +9,6 @@ SRCS=	AddrModeMatcher.cpp \
 	BreakCriticalEdges.cpp \
 	BuildLibCalls.cpp \
 	CloneFunction.cpp \
-	CloneLoop.cpp \
 	CloneModule.cpp \
 	CodeExtractor.cpp \
 	DemoteRegToStack.cpp \
@@ -19,6 +18,7 @@ SRCS=	AddrModeMatcher.cpp \
 	Local.cpp \
 	LoopSimplify.cpp \
 	LoopUnroll.cpp \
+	LowerExpectIntrinsic.cpp \
 	LowerInvoke.cpp \
 	LowerSwitch.cpp \
 	Mem2Reg.cpp \
diff --git a/lib/clang/libllvmx86asmparser/Makefile b/lib/clang/libllvmx86asmparser/Makefile
index c6bdab7..c140268 100644
--- a/lib/clang/libllvmx86asmparser/Makefile
+++ b/lib/clang/libllvmx86asmparser/Makefile
@@ -8,7 +8,8 @@ SRCS=	X86AsmLexer.cpp \
 	X86AsmParser.cpp
 
 TGHDRS=	X86GenAsmMatcher \
-	X86GenInstrNames \
-	X86GenRegisterNames
+	X86GenInstrInfo \
+	X86GenRegisterInfo \
+	X86GenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86codegen/Makefile b/lib/clang/libllvmx86codegen/Makefile
index 300ad9a..6964501 100644
--- a/lib/clang/libllvmx86codegen/Makefile
+++ b/lib/clang/libllvmx86codegen/Makefile
@@ -16,7 +16,6 @@ SRCS=	SSEDomainFix.cpp \
 	X86ISelLowering.cpp \
 	X86InstrInfo.cpp \
 	X86JITInfo.cpp \
-	X86MCAsmInfo.cpp \
 	X86MCCodeEmitter.cpp \
 	X86MCInstLower.cpp \
 	X86MachObjectWriter.cpp \
@@ -31,10 +30,7 @@ TGHDRS=	Intrinsics \
 	X86GenDAGISel \
 	X86GenFastISel \
 	X86GenInstrInfo \
-	X86GenInstrNames \
 	X86GenRegisterInfo \
-	X86GenRegisterInfo.h \
-	X86GenRegisterNames \
-	X86GenSubtarget
+	X86GenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86desc/Makefile b/lib/clang/libllvmx86desc/Makefile
new file mode 100644
index 0000000..44b20a5
--- /dev/null
+++ b/lib/clang/libllvmx86desc/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+LIB=	llvmx86desc
+
+SRCDIR=	lib/Target/X86/MCTargetDesc
+SRCS=	X86MCAsmInfo.cpp \
+	X86MCTargetDesc.cpp
+
+TGHDRS=	X86GenInstrInfo \
+	X86GenRegisterInfo \
+	X86GenSubtargetInfo
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86disassembler/Makefile b/lib/clang/libllvmx86disassembler/Makefile
index 0b88643..b9055fc 100644
--- a/lib/clang/libllvmx86disassembler/Makefile
+++ b/lib/clang/libllvmx86disassembler/Makefile
@@ -8,6 +8,6 @@ SRCS=	X86Disassembler.cpp
 
 TGHDRS=	X86GenDisassemblerTables \
 	X86GenEDInfo \
-	X86GenRegisterNames
+	X86GenRegisterInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86info/Makefile b/lib/clang/libllvmx86info/Makefile
index 8e92b62..62b506e 100644
--- a/lib/clang/libllvmx86info/Makefile
+++ b/lib/clang/libllvmx86info/Makefile
@@ -6,7 +6,8 @@ SRCDIR=	lib/Target/X86/TargetInfo/
 INCDIR=	lib/Target/X86
 SRCS=	X86TargetInfo.cpp
 
-TGHDRS=	X86GenInstrNames \
-	X86GenRegisterNames
+TGHDRS=	X86GenInstrInfo \
+	X86GenRegisterInfo \
+	X86GenSubtargetInfo
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86instprinter/Makefile b/lib/clang/libllvmx86instprinter/Makefile
index eb30daa..a44006c 100644
--- a/lib/clang/libllvmx86instprinter/Makefile
+++ b/lib/clang/libllvmx86instprinter/Makefile
@@ -10,7 +10,8 @@ SRCS=	X86ATTInstPrinter.cpp \
 
 TGHDRS=	X86GenAsmWriter \
 	X86GenAsmWriter1 \
-	X86GenInstrNames \
-	X86GenRegisterNames
+	X86GenInstrInfo \
+	X86GenRegisterInfo \
+	X86GenSubtargetInfo
 
 .include "../clang.lib.mk"