Author: vsapsai Date: Mon May 13 15:40:11 2019 New Revision: 360630 URL: http://llvm.org/viewvc/llvm-project?rev=360630&view=rev Log: [X86] Make `x86intrin.h`, `immintrin.h` includable with `-fno-gnu-inline-asm`.
Currently `immintrin.h` includes `pconfigintrin.h` and `sgxintrin.h` which contain inline assembly. It causes failures when building with the flag `-fno-gnu-inline-asm`. Fix by excluding functions with inline assembly when this extension is disabled. So far there was no need to support `_pconfig_u32`, `_enclu_u32`, `_encls_u32`, `_enclv_u32` on platforms that require `-fno-gnu-inline-asm`. But if developers start using these functions, they'll have compile-time undeclared identifier errors which is preferrable to runtime errors. rdar://problem/49540880 Reviewers: craig.topper, GBuella, rnk, echristo Reviewed By: rnk Subscribers: jkorous, dexonsmith, cfe-commits Differential Revision: https://reviews.llvm.org/D61621 Modified: 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 Modified: cfe/trunk/lib/Headers/immintrin.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/immintrin.h?rev=360630&r1=360629&r2=360630&view=diff ============================================================================== --- cfe/trunk/lib/Headers/immintrin.h (original) +++ cfe/trunk/lib/Headers/immintrin.h Mon May 13 15:40:11 2019 @@ -421,7 +421,7 @@ _storebe_i64(void * __P, long long __D) #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 @@ _InterlockedCompareExchange64_HLERelease #undef __DEFAULT_FN_ATTRS -#endif /* _MSC_VER */ +#endif /* defined(_MSC_VER) && __has_extension(gnu_asm) */ #endif /* __IMMINTRIN_H */ Modified: cfe/trunk/lib/Headers/pconfigintrin.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/pconfigintrin.h?rev=360630&r1=360629&r2=360630&view=diff ============================================================================== --- cfe/trunk/lib/Headers/pconfigintrin.h (original) +++ cfe/trunk/lib/Headers/pconfigintrin.h Mon May 13 15:40:11 2019 @@ -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 @@ _pconfig_u32(unsigned int __leaf, __SIZE #undef __DEFAULT_FN_ATTRS +#endif /* __has_extension(gnu_asm) */ + #endif Modified: cfe/trunk/lib/Headers/sgxintrin.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/sgxintrin.h?rev=360630&r1=360629&r2=360630&view=diff ============================================================================== --- cfe/trunk/lib/Headers/sgxintrin.h (original) +++ cfe/trunk/lib/Headers/sgxintrin.h Mon May 13 15:40:11 2019 @@ -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 @@ _enclv_u32(unsigned int __leaf, __SIZE_T #undef __DEFAULT_FN_ATTRS +#endif /* __has_extension(gnu_asm) */ + #endif Modified: cfe/trunk/test/Modules/compiler_builtins_x86.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/compiler_builtins_x86.c?rev=360630&r1=360629&r2=360630&view=diff ============================================================================== --- cfe/trunk/test/Modules/compiler_builtins_x86.c (original) +++ cfe/trunk/test/Modules/compiler_builtins_x86.c Mon May 13 15:40:11 2019 @@ -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> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits