From 83bdfe5e51af7bfd484e5e22dfdcd0786c2ef702 Mon Sep 17 00:00:00 2001 From: Raphael Isemann Date: Wed, 23 May 2018 20:59:46 +0000 Subject: [PATCH] [modules] Mark __wmmintrin_pclmul.h/__wmmintrin_aes.h as textual Summary: Since clang r332929 these two headers throw errors when included from somewhere else than their wrapper header. It seems marking them as textual is the best way to fix the builds. Fixes this new module build error: While building module '_Builtin_intrinsics' imported from ...: In file included from :2: In file included from lib/clang/7.0.0/include/immintrin.h:54: In file included from lib/clang/7.0.0/include/wmmintrin.h:29: lib/clang/7.0.0/include/__wmmintrin_aes.h:25:2: error: "Never use <__wmmintrin_aes.h> directly; include instead." #error "Never use <__wmmintrin_aes.h> directly; include instead." Reviewers: rsmith, v.g.vassilev, craig.topper Reviewed By: craig.topper Subscribers: craig.topper, cfe-commits Differential Revision: https://reviews.llvm.org/D47277 llvm-svn: 333123 --- clang/lib/Headers/module.modulemap | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/clang/lib/Headers/module.modulemap b/clang/lib/Headers/module.modulemap index 0f10dd4c0816..b26ff5ebb585 100644 --- a/clang/lib/Headers/module.modulemap +++ b/clang/lib/Headers/module.modulemap @@ -71,6 +71,9 @@ module _Builtin_intrinsics [system] [extern_c] { textual header "sgxintrin.h" textual header "ptwriteintrin.h" + textual header "__wmmintrin_aes.h" + textual header "__wmmintrin_pclmul.h" + explicit module mm_malloc { requires !freestanding header "mm_malloc.h" @@ -136,14 +139,6 @@ module _Builtin_intrinsics [system] [extern_c] { export aes export pclmul } - - explicit module aes { - header "__wmmintrin_aes.h" - } - - explicit module pclmul { - header "__wmmintrin_pclmul.h" - } } explicit module systemz {