From d4271816c7c7b9ad396f517ebe4f21ec9cdc4b8f Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 20 Aug 2012 20:56:40 +0000
Subject: [PATCH] Add three additional clang intrinsics headers, which I missed
 in the previous import.

---
 lib/clang/include/Makefile               | 5 ++++-
 tools/build/mk/OptionalObsoleteFiles.inc | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile
index bb58411c3ced..bee6d58ca078 100644
--- a/lib/clang/include/Makefile
+++ b/lib/clang/include/Makefile
@@ -5,6 +5,7 @@
 INCSDIR=${INCLUDEDIR}/clang/3.2
 
 INCS=	altivec.h \
+	ammintrin.h \
 	avx2intrin.h \
 	avxintrin.h \
 	bmi2intrin.h \
@@ -12,6 +13,7 @@ INCS=	altivec.h \
 	cpuid.h \
 	emmintrin.h \
 	fma4intrin.h \
+	fmaintrin.h \
 	immintrin.h \
 	lzcntintrin.h \
 	mm3dnow.h \
@@ -26,7 +28,8 @@ INCS=	altivec.h \
 	unwind.h \
 	wmmintrin.h \
 	x86intrin.h \
-	xmmintrin.h
+	xmmintrin.h \
+	xopintrin.h
 
 .include <bsd.init.mk>
 .include <bsd.incs.mk>
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 457ffd6f947f..06f82fb9a701 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -684,6 +684,7 @@ OLD_FILES+=usr/include/clang/3.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.1/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.1
 OLD_FILES+=usr/include/clang/3.2/altivec.h
+OLD_FILES+=usr/include/clang/3.2/ammintrin.h
 OLD_FILES+=usr/include/clang/3.2/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.2/avxintrin.h
 OLD_FILES+=usr/include/clang/3.2/bmi2intrin.h
@@ -691,6 +692,7 @@ OLD_FILES+=usr/include/clang/3.2/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.2/cpuid.h
 OLD_FILES+=usr/include/clang/3.2/emmintrin.h
 OLD_FILES+=usr/include/clang/3.2/fma4intrin.h
+OLD_FILES+=usr/include/clang/3.2/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.2/immintrin.h
 OLD_FILES+=usr/include/clang/3.2/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.2/mm3dnow.h
@@ -706,6 +708,7 @@ OLD_FILES+=usr/include/clang/3.2/unwind.h
 OLD_FILES+=usr/include/clang/3.2/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/x86intrin.h
 OLD_FILES+=usr/include/clang/3.2/xmmintrin.h
+OLD_FILES+=usr/include/clang/3.2/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.2
 OLD_DIRS+=usr/include/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT