[X86] Make f16c intrinsics accessible through emmintrin.h, per Intel docs

Differential Revision: http://reviews.llvm.org/D13015

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@248156 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Headers/emmintrin.h b/lib/Headers/emmintrin.h
index 2cea74b27c282979836a7e00b439c19d5a5e8e35..761aefafa18b70a2e26620d42ae087279351977c 100644 (file)
--- a/lib/Headers/emmintrin.h
+++ b/lib/Headers/emmintrin.h
@@ -35,6 +35,8 @@ typedef long long __v2di __attribute__ ((__vector_size__ (16)));
 typedef short __v8hi __attribute__((__vector_size__(16)));
 typedef char __v16qi __attribute__((__vector_size__(16)));
 
+#include <f16cintrin.h>
+
 /* Define the default attributes for the functions in this file. */
 #define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("sse2")))
 

diff --git a/lib/Headers/f16cintrin.h b/lib/Headers/f16cintrin.h
index 9349b78fe84ce0fd802856c662606ca4719da787..9fb454574af92dc80926752c6645524b8e648afd 100644 (file)
--- a/lib/Headers/f16cintrin.h
+++ b/lib/Headers/f16cintrin.h
@@ -21,8 +21,8 @@
  *===-----------------------------------------------------------------------===
  */
 
-#if !defined __X86INTRIN_H && !defined __IMMINTRIN_H
-#error "Never use <f16cintrin.h> directly; include <x86intrin.h> instead."
+#if !defined __X86INTRIN_H && !defined __EMMINTRIN_H && !defined __IMMINTRIN_H
+#error "Never use <f16cintrin.h> directly; include <emmintrin.h> instead."
 #endif
 
 #ifndef __F16CINTRIN_H