Author: teemperor Date: Wed May 23 13:59:46 2018 New Revision: 333123 URL: http://llvm.org/viewvc/llvm-project?rev=333123&view=rev Log: [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 <module-includes>: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 <wmmintrin.h> instead." #error "Never use <__wmmintrin_aes.h> directly; include <wmmintrin.h> instead." Reviewers: rsmith, v.g.vassilev, craig.topper Reviewed By: craig.topper Subscribers: craig.topper, cfe-commits Differential Revision: https://reviews.llvm.org/D47277 Modified: cfe/trunk/lib/Headers/module.modulemap Modified: cfe/trunk/lib/Headers/module.modulemap URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/module.modulemap?rev=333123&r1=333122&r2=333123&view=diff ============================================================================== --- cfe/trunk/lib/Headers/module.modulemap (original) +++ cfe/trunk/lib/Headers/module.modulemap Wed May 23 13:59:46 2018 @@ -71,6 +71,9 @@ module _Builtin_intrinsics [system] [ext 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] [ext export aes export pclmul } - - explicit module aes { - header "__wmmintrin_aes.h" - } - - explicit module pclmul { - header "__wmmintrin_pclmul.h" - } } explicit module systemz { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits