From 9b5d4f6e6689cb80933aa5ac22684c83c7604a11 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 21 Aug 2020 18:23:22 +0100 Subject: [PATCH] libstdc++: Do not check "cold" name on darwin [PR 96736] libstdc++-v3/ChangeLog: PR libstdc++/96736 * testsuite/17_intro/headers/c++1998/all_attributes.cc: Do not test "cold" on darwin. * testsuite/17_intro/headers/c++2011/all_attributes.cc: Likewise. * testsuite/17_intro/headers/c++2014/all_attributes.cc: Likewise. * testsuite/17_intro/headers/c++2017/all_attributes.cc: Likewise. * testsuite/17_intro/headers/c++2020/all_attributes.cc: Likewise. --- .../testsuite/17_intro/headers/c++1998/all_attributes.cc | 2 +- .../testsuite/17_intro/headers/c++2011/all_attributes.cc | 2 +- .../testsuite/17_intro/headers/c++2014/all_attributes.cc | 2 +- .../testsuite/17_intro/headers/c++2017/all_attributes.cc | 2 +- .../testsuite/17_intro/headers/c++2020/all_attributes.cc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc index dd28429e1d5..4be7b0a8050 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc @@ -21,10 +21,10 @@ // Ensure the library only uses the __name__ form for attributes. // Don't test 'const' because it is reserved anyway. #define abi_tag 1 -#define cold 1 #ifndef __APPLE__ // darwin headers use these, see PR 64883 # define always_inline 1 +# define cold 1 # define deprecated 1 # define noreturn 1 # define visibility 1 diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2011/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/all_attributes.cc index db00a33f6a3..21c69f59fee 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++2011/all_attributes.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/all_attributes.cc @@ -21,10 +21,10 @@ // Ensure the library only uses the __name__ form for attributes. // Don't test 'const' and 'noreturn' because they are reserved anyway. #define abi_tag 1 -#define cold 1 #ifndef __APPLE__ // darwin headers use these, see PR 64883 # define always_inline 1 +# define cold 1 # define deprecated 1 # define visibility 1 #endif diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc index 3322c2c1362..a041ebb47b9 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc @@ -21,10 +21,10 @@ // Ensure the library only uses the __name__ form for attributes. // Don't test 'const' and 'noreturn' because they are reserved anyway. #define abi_tag 1 -#define cold 1 #ifndef __APPLE__ // darwin headers use these, see PR 64883 # define always_inline 1 +# define cold 1 # define deprecated 1 # define visibility 1 #endif diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2017/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2017/all_attributes.cc index a0d67739d71..812066dae08 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++2017/all_attributes.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2017/all_attributes.cc @@ -21,10 +21,10 @@ // Ensure the library only uses the __name__ form for attributes. // Don't test 'const' and 'noreturn' because they are reserved anyway. #define abi_tag 1 -#define cold 1 #ifndef __APPLE__ // darwin headers use these, see PR 64883 # define always_inline 1 +# define cold 1 # define visibility 1 #endif #define packed 1 diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2020/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2020/all_attributes.cc index da8f0e415a3..d78f13ee8c1 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++2020/all_attributes.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2020/all_attributes.cc @@ -21,10 +21,10 @@ // Ensure the library only uses the __name__ form for attributes. // Don't test 'const' and 'noreturn' because they are reserved anyway. #define abi_tag 1 -#define cold 1 #ifndef __APPLE__ // darwin headers use these, see PR 64883 # define always_inline 1 +# define cold 1 # define visibility 1 #endif #define packed 1 -- 2.30.2