[PATCH] D47277: [modules] Mark __wmmintrin_pclmul.h/__wmmintrin_aes.h as textual

[Raphael Isemann via Phabricator via cfe-commits]

teemperor created this revision.
teemperor added reviewers: rsmith, slydiman.

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."


https://reviews.llvm.org/D47277

Files:
  lib/Headers/module.modulemap


Index: lib/Headers/module.modulemap
===================================================================
--- lib/Headers/module.modulemap
+++ lib/Headers/module.modulemap
@@ -71,6 +71,9 @@
     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 @@
       export aes
       export pclmul
     }
-
-    explicit module aes {
-      header "__wmmintrin_aes.h"
-    }
-
-    explicit module pclmul {
-      header "__wmmintrin_pclmul.h"
-    }
   }
 
   explicit module systemz {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D47277.148272.patch
Type: text/x-patch
Size: 687 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180523/99319dcc/attachment-0001.bin>