Skip to content

Commit

Permalink
[modules] Mark __wmmintrin_pclmul.h/__wmmintrin_aes.h as textual
Browse files Browse the repository at this point in the history
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

llvm-svn: 333123
  • Loading branch information
Teemperor committed May 23, 2018
1 parent 4925392 commit 83bdfe5
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions clang/lib/Headers/module.modulemap
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 83bdfe5

Please sign in to comment.