This revision was automatically updated to reflect the committed changes. Closed by commit rL360630: [X86] Make `x86intrin.h`, `immintrin.h` includable with `-fno-gnu-inline-asm`. (authored by vsapsai, committed by ). Herald added a project: LLVM. Herald added a subscriber: llvm-commits.
Changed prior to commit: https://reviews.llvm.org/D61621?vs=198875&id=199342#toc Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D61621/new/ https://reviews.llvm.org/D61621 Files: cfe/trunk/lib/Headers/immintrin.h cfe/trunk/lib/Headers/pconfigintrin.h cfe/trunk/lib/Headers/sgxintrin.h cfe/trunk/test/Modules/compiler_builtins_x86.c Index: cfe/trunk/test/Modules/compiler_builtins_x86.c =================================================================== --- cfe/trunk/test/Modules/compiler_builtins_x86.c +++ cfe/trunk/test/Modules/compiler_builtins_x86.c @@ -1,6 +1,8 @@ // RUN: rm -rf %t // RUN: %clang_cc1 -triple i686-unknown-unknown -fsyntax-only -fmodules -fimplicit-module-maps -fmodules-cache-path=%t %s -verify -ffreestanding // RUN: %clang_cc1 -triple i686-unknown-unknown -fsyntax-only -fmodules -fmodule-map-file=%resource_dir/module.modulemap -fmodules-cache-path=%t %s -verify -ffreestanding +// RUN: %clang_cc1 -triple i686-unknown-unknown -fsyntax-only -fmodules -fimplicit-module-maps -fmodules-cache-path=%t %s -verify -ffreestanding -fno-gnu-inline-asm +// RUN: %clang_cc1 -triple i686--windows -fsyntax-only -fmodules -fimplicit-module-maps -fmodules-cache-path=%t %s -verify -ffreestanding -fno-gnu-inline-asm -fms-extensions -fms-compatibility-version=17.00 // expected-no-diagnostics #include<x86intrin.h> Index: cfe/trunk/lib/Headers/pconfigintrin.h =================================================================== --- cfe/trunk/lib/Headers/pconfigintrin.h +++ cfe/trunk/lib/Headers/pconfigintrin.h @@ -16,6 +16,8 @@ #define __PCONFIG_KEY_PROGRAM 0x00000001 +#if __has_extension(gnu_asm) + /* Define the default attributes for the functions in this file. */ #define __DEFAULT_FN_ATTRS \ __attribute__((__always_inline__, __nodebug__, __target__("pconfig"))) @@ -33,4 +35,6 @@ #undef __DEFAULT_FN_ATTRS +#endif /* __has_extension(gnu_asm) */ + #endif Index: cfe/trunk/lib/Headers/immintrin.h =================================================================== --- cfe/trunk/lib/Headers/immintrin.h +++ cfe/trunk/lib/Headers/immintrin.h @@ -421,7 +421,7 @@ #include <invpcidintrin.h> #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && __has_extension(gnu_asm) /* Define the default attributes for these intrinsics */ #define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__)) #ifdef __cplusplus @@ -503,6 +503,6 @@ #undef __DEFAULT_FN_ATTRS -#endif /* _MSC_VER */ +#endif /* defined(_MSC_VER) && __has_extension(gnu_asm) */ #endif /* __IMMINTRIN_H */ Index: cfe/trunk/lib/Headers/sgxintrin.h =================================================================== --- cfe/trunk/lib/Headers/sgxintrin.h +++ cfe/trunk/lib/Headers/sgxintrin.h @@ -14,6 +14,8 @@ #ifndef __SGXINTRIN_H #define __SGXINTRIN_H +#if __has_extension(gnu_asm) + /* Define the default attributes for the functions in this file. */ #define __DEFAULT_FN_ATTRS \ __attribute__((__always_inline__, __nodebug__, __target__("sgx"))) @@ -53,4 +55,6 @@ #undef __DEFAULT_FN_ATTRS +#endif /* __has_extension(gnu_asm) */ + #endif
Index: cfe/trunk/test/Modules/compiler_builtins_x86.c =================================================================== --- cfe/trunk/test/Modules/compiler_builtins_x86.c +++ cfe/trunk/test/Modules/compiler_builtins_x86.c @@ -1,6 +1,8 @@ // RUN: rm -rf %t // RUN: %clang_cc1 -triple i686-unknown-unknown -fsyntax-only -fmodules -fimplicit-module-maps -fmodules-cache-path=%t %s -verify -ffreestanding // RUN: %clang_cc1 -triple i686-unknown-unknown -fsyntax-only -fmodules -fmodule-map-file=%resource_dir/module.modulemap -fmodules-cache-path=%t %s -verify -ffreestanding +// RUN: %clang_cc1 -triple i686-unknown-unknown -fsyntax-only -fmodules -fimplicit-module-maps -fmodules-cache-path=%t %s -verify -ffreestanding -fno-gnu-inline-asm +// RUN: %clang_cc1 -triple i686--windows -fsyntax-only -fmodules -fimplicit-module-maps -fmodules-cache-path=%t %s -verify -ffreestanding -fno-gnu-inline-asm -fms-extensions -fms-compatibility-version=17.00 // expected-no-diagnostics #include<x86intrin.h> Index: cfe/trunk/lib/Headers/pconfigintrin.h =================================================================== --- cfe/trunk/lib/Headers/pconfigintrin.h +++ cfe/trunk/lib/Headers/pconfigintrin.h @@ -16,6 +16,8 @@ #define __PCONFIG_KEY_PROGRAM 0x00000001 +#if __has_extension(gnu_asm) + /* Define the default attributes for the functions in this file. */ #define __DEFAULT_FN_ATTRS \ __attribute__((__always_inline__, __nodebug__, __target__("pconfig"))) @@ -33,4 +35,6 @@ #undef __DEFAULT_FN_ATTRS +#endif /* __has_extension(gnu_asm) */ + #endif Index: cfe/trunk/lib/Headers/immintrin.h =================================================================== --- cfe/trunk/lib/Headers/immintrin.h +++ cfe/trunk/lib/Headers/immintrin.h @@ -421,7 +421,7 @@ #include <invpcidintrin.h> #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && __has_extension(gnu_asm) /* Define the default attributes for these intrinsics */ #define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__)) #ifdef __cplusplus @@ -503,6 +503,6 @@ #undef __DEFAULT_FN_ATTRS -#endif /* _MSC_VER */ +#endif /* defined(_MSC_VER) && __has_extension(gnu_asm) */ #endif /* __IMMINTRIN_H */ Index: cfe/trunk/lib/Headers/sgxintrin.h =================================================================== --- cfe/trunk/lib/Headers/sgxintrin.h +++ cfe/trunk/lib/Headers/sgxintrin.h @@ -14,6 +14,8 @@ #ifndef __SGXINTRIN_H #define __SGXINTRIN_H +#if __has_extension(gnu_asm) + /* Define the default attributes for the functions in this file. */ #define __DEFAULT_FN_ATTRS \ __attribute__((__always_inline__, __nodebug__, __target__("sgx"))) @@ -53,4 +55,6 @@ #undef __DEFAULT_FN_ATTRS +#endif /* __has_extension(gnu_asm) */ + #endif
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits