From df9835717d01ca99cc4f92c1e063c1fccacb2858 Mon Sep 17 00:00:00 2001
From: Douglas Gregor <dgregor@apple.com>
Date: Fri, 7 Jun 2013 22:49:44 +0000
Subject: [PATCH] Even in a modules world, people will depend on the weird
 xmmintrin.h -> emmintrin.h forwarding.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@183585 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Headers/module.map  | 1 +
 lib/Headers/xmmintrin.h | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/Headers/module.map b/lib/Headers/module.map
index d1d3aefd19..9f7944dedb 100644
--- a/lib/Headers/module.map
+++ b/lib/Headers/module.map
@@ -44,6 +44,7 @@ module _Builtin_intrinsics [system] {
     explicit module sse {
       requires sse
       export mmx
+      export * // note: for hackish <emmintrin.h> dependency
       header "xmmintrin.h"
     }
 
diff --git a/lib/Headers/xmmintrin.h b/lib/Headers/xmmintrin.h
index 8c5fc9528c..b3b23cb7d0 100644
--- a/lib/Headers/xmmintrin.h
+++ b/lib/Headers/xmmintrin.h
@@ -983,12 +983,10 @@ do { \
 #define _m_ _mm_
 #define _m_ _mm_
 
-#if !__has_feature(modules)
 /* Ugly hack for backwards-compatibility (compatible with gcc) */
 #ifdef __SSE2__
 #include <emmintrin.h>
 #endif
-#endif
 
 #endif /* __SSE__ */
 
-- 
2.40.0