From c8288db409122cbf8a26da9252f70df48cd520bb Mon Sep 17 00:00:00 2001 From: Tim Northover Date: Thu, 11 Feb 2016 21:31:51 +0000 Subject: [PATCH] Relax recently added clang version checks. You can override the value of these during CMake, and we often use sentinels with more than one digit (not to mention our actual Clang being 700.whatever). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@260596 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Preprocessor/init.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/Preprocessor/init.c b/test/Preprocessor/init.c index 4971d19795..73dc4b5460 100644 --- a/test/Preprocessor/init.c +++ b/test/Preprocessor/init.c @@ -8483,10 +8483,10 @@ // WEBASSEMBLY32-NEXT:#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 // WEBASSEMBLY32-NEXT:#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 // WEBASSEMBLY32-NEXT:#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 -// WEBASSEMBLY32-NEXT:#define __GNUC_MINOR__ {{.}} -// WEBASSEMBLY32-NEXT:#define __GNUC_PATCHLEVEL__ {{.}} +// WEBASSEMBLY32-NEXT:#define __GNUC_MINOR__ {{.*}} +// WEBASSEMBLY32-NEXT:#define __GNUC_PATCHLEVEL__ {{.*}} // WEBASSEMBLY32-NEXT:#define __GNUC_STDC_INLINE__ 1 -// WEBASSEMBLY32-NEXT:#define __GNUC__ {{.}} +// WEBASSEMBLY32-NEXT:#define __GNUC__ {{.*}} // WEBASSEMBLY32-NEXT:#define __GXX_ABI_VERSION 1002 // WEBASSEMBLY32-NEXT:#define __ILP32__ 1 // WEBASSEMBLY32-NEXT:#define __INT16_C_SUFFIX__ @@ -8718,9 +8718,9 @@ // WEBASSEMBLY32-NOT:#define __WINT_UNSIGNED__ // WEBASSEMBLY32-NEXT:#define __WINT_WIDTH__ 32 // WEBASSEMBLY32-NEXT:#define __clang__ 1 -// WEBASSEMBLY32-NEXT:#define __clang_major__ {{.}} -// WEBASSEMBLY32-NEXT:#define __clang_minor__ {{.}} -// WEBASSEMBLY32-NEXT:#define __clang_patchlevel__ {{.}} +// WEBASSEMBLY32-NEXT:#define __clang_major__ {{.*}} +// WEBASSEMBLY32-NEXT:#define __clang_minor__ {{.*}} +// WEBASSEMBLY32-NEXT:#define __clang_patchlevel__ {{.*}} // WEBASSEMBLY32-NEXT:#define __clang_version__ "{{.*}}" // WEBASSEMBLY32-NEXT:#define __llvm__ 1 // WEBASSEMBLY32-NOT:#define __wasm_simd128__ @@ -8798,8 +8798,8 @@ // WEBASSEMBLY64-NEXT:#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 // WEBASSEMBLY64-NEXT:#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 // WEBASSEMBLY64-NEXT:#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 -// WEBASSEMBLY64-NEXT:#define __GNUC_MINOR__ {{.}} -// WEBASSEMBLY64-NEXT:#define __GNUC_PATCHLEVEL__ {{.}} +// WEBASSEMBLY64-NEXT:#define __GNUC_MINOR__ {{.*}} +// WEBASSEMBLY64-NEXT:#define __GNUC_PATCHLEVEL__ {{.*}} // WEBASSEMBLY64-NEXT:#define __GNUC_STDC_INLINE__ 1 // WEBASSEMBLY64-NEXT:#define __GNUC__ {{.}} // WEBASSEMBLY64-NEXT:#define __GXX_ABI_VERSION 1002 @@ -9033,9 +9033,9 @@ // WEBASSEMBLY64-NOT:#define __WINT_UNSIGNED__ // WEBASSEMBLY64-NEXT:#define __WINT_WIDTH__ 32 // WEBASSEMBLY64-NEXT:#define __clang__ 1 -// WEBASSEMBLY64-NEXT:#define __clang_major__ {{.}} -// WEBASSEMBLY64-NEXT:#define __clang_minor__ {{.}} -// WEBASSEMBLY64-NEXT:#define __clang_patchlevel__ {{.}} +// WEBASSEMBLY64-NEXT:#define __clang_major__ {{.*}} +// WEBASSEMBLY64-NEXT:#define __clang_minor__ {{.*}} +// WEBASSEMBLY64-NEXT:#define __clang_patchlevel__ {{.*}} // WEBASSEMBLY64-NEXT:#define __clang_version__ "{{.*}}" // WEBASSEMBLY64-NEXT:#define __llvm__ 1 // WEBASSEMBLY64-NOT:#define __wasm_simd128__ -- 2.40.0