From: Michael Kuperstein <michael.m.kuperstein@intel.com>
Date: Mon, 21 Sep 2015 13:34:47 +0000 (+0000)
Subject: [X86] Make f16c intrinsics accessible through emmintrin.h, per Intel docs
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=779826214297448d7678a8a2c20e90ea46e1b325;p=clang

[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 2cea74b27c..761aefafa1 100644
--- 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 9349b78fe8..9fb454574a 100644
--- 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