aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Headers/module.map1
-rw-r--r--lib/Headers/xmmintrin.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/Headers/module.map b/lib/Headers/module.map
index b24bccc120..1b476a5e55 100644
--- a/lib/Headers/module.map
+++ b/lib/Headers/module.map
@@ -33,7 +33,6 @@ 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 b3b23cb7d0..8c5fc9528c 100644
--- a/lib/Headers/xmmintrin.h
+++ b/lib/Headers/xmmintrin.h
@@ -983,10 +983,12 @@ 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__ */