From 3ca143b1900dbb24699dde563ea0ebfb46bbefbf Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 6 Aug 2020 17:45:35 -0400 Subject: Fix warning suppression on Apple platforms --- TestPrograms/test_cxx11_noexcept.cxx | 9 ++++++++- TestPrograms/test_ppc_power7.cxx | 9 ++++++++- TestPrograms/test_ppc_power8.cxx | 9 ++++++++- TestPrograms/test_ppc_power9.cxx | 9 ++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) (limited to 'TestPrograms') diff --git a/TestPrograms/test_cxx11_noexcept.cxx b/TestPrograms/test_cxx11_noexcept.cxx index 95cca1bc..f2813dc2 100644 --- a/TestPrograms/test_cxx11_noexcept.cxx +++ b/TestPrograms/test_cxx11_noexcept.cxx @@ -1,5 +1,12 @@ #define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10) -#if (GNUC_VERSION >= 4060) || defined(__clang__) + +#if defined(__apple_build_version__) +# define APPLE_VERSION (__clang__*1000 + __clang_minor__*10) +#else +# define LLVM_VERSION (__clang__*1000 + __clang_minor__*10) +#endif + +#if (GNUC_VERSION >= 4060) || (LLVM_VERSION >= 1070) || (APPLE_VERSION >= 2000) # pragma GCC diagnostic ignored "-Wterminate" #endif diff --git a/TestPrograms/test_ppc_power7.cxx b/TestPrograms/test_ppc_power7.cxx index d6c568d0..e1f27ace 100644 --- a/TestPrograms/test_ppc_power7.cxx +++ b/TestPrograms/test_ppc_power7.cxx @@ -1,5 +1,12 @@ #define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10) -#if (GNUC_VERSION >= 4060) || defined(__clang__) + +#if defined(__apple_build_version__) +# define APPLE_VERSION (__clang__*1000 + __clang_minor__*10) +#else +# define LLVM_VERSION (__clang__*1000 + __clang_minor__*10) +#endif + +#if (GNUC_VERSION >= 4060) || (LLVM_VERSION >= 1070) || (APPLE_VERSION >= 2000) # pragma GCC diagnostic ignored "-Wdeprecated" #endif diff --git a/TestPrograms/test_ppc_power8.cxx b/TestPrograms/test_ppc_power8.cxx index 451bf657..84840226 100644 --- a/TestPrograms/test_ppc_power8.cxx +++ b/TestPrograms/test_ppc_power8.cxx @@ -1,5 +1,12 @@ #define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10) -#if (GNUC_VERSION >= 4060) || defined(__clang__) + +#if defined(__apple_build_version__) +# define APPLE_VERSION (__clang__*1000 + __clang_minor__*10) +#else +# define LLVM_VERSION (__clang__*1000 + __clang_minor__*10) +#endif + +#if (GNUC_VERSION >= 4060) || (LLVM_VERSION >= 1070) || (APPLE_VERSION >= 2000) # pragma GCC diagnostic ignored "-Wdeprecated" #endif diff --git a/TestPrograms/test_ppc_power9.cxx b/TestPrograms/test_ppc_power9.cxx index b39c5c7f..2333f9b3 100644 --- a/TestPrograms/test_ppc_power9.cxx +++ b/TestPrograms/test_ppc_power9.cxx @@ -1,5 +1,12 @@ #define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10) -#if (GNUC_VERSION >= 4060) || defined(__clang__) + +#if defined(__apple_build_version__) +# define APPLE_VERSION (__clang__*1000 + __clang_minor__*10) +#else +# define LLVM_VERSION (__clang__*1000 + __clang_minor__*10) +#endif + +#if (GNUC_VERSION >= 4060) || (LLVM_VERSION >= 1070) || (APPLE_VERSION >= 2000) # pragma GCC diagnostic ignored "-Wdeprecated" #endif -- cgit v1.2.1