Even in a modules world, people will depend on the weird xmmintrin.h -> emmintrin...

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

diff --git a/lib/Headers/module.map b/lib/Headers/module.map
index d1d3aefd1910d67f44b9676cb79435a70404b8ac..9f7944dedbb03dc05995ebaf6bebf890ca90b52e 100644 (file)
--- 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 8c5fc9528cf0b7c641276f5ecf026bc7f7eb8704..b3b23cb7d0d4d6efc676c3296fa8f1ed5c45e4af 100644 (file)
--- 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__ */