From: Iain Sandoe Date: Mon, 24 Dec 2018 13:01:04 +0000 (+0000) Subject: Fix libstdc++/64883 for Darwin. X-Git-Tag: releases/gcc-7.5.0~695 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=116a4b616a9ff59030a654a010328a7e1584a2e6;p=thirdparty%2Fgcc.git Fix libstdc++/64883 for Darwin. 2018-12-24 Iain Sandoe Backport from mainline 2018-12-06 Jonathan Wakely Iain Sandoe PR libstdc++/64883 * testsuite/17_intro/headers/c++1998/all_attributes.cc: Don't test always_inline 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. From-SVN: r267407 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index de26ed1c0959..b2c06d1d685d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2018-12-24 Iain Sandoe + + Backport from mainline + 2018-12-06 Jonathan Wakely + Iain Sandoe + + PR libstdc++/64883 + * testsuite/17_intro/headers/c++1998/all_attributes.cc: Don't test + always_inline 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. + 2018-12-24 Iain Sandoe Backport from mainline 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 6d6d79803969..f5d1d4563b34 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,9 +21,9 @@ // Ensure the library only uses the __name__ form for attributes. // Don't test 'const' because it is reserved anyway. #define abi_tag 1 -#define always_inline 1 #ifndef __APPLE__ // darwin headers use these, see PR 64883 +# define always_inline 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 415ece0296f3..ef7b14a5919f 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,11 +21,11 @@ // 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 always_inline 1 #ifndef __APPLE__ // darwin headers use these, see PR 64883 -# define visibility 1 +# define always_inline 1 # define deprecated 1 +# define visibility 1 #endif #define packed 1 #define pure 1 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 d4ef52412a3c..0f15e9cdac50 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,9 +21,9 @@ // 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 always_inline 1 #ifndef __APPLE__ // darwin headers use these, see PR 64883 +# define always_inline 1 # define deprecated 1 # define visibility 1 #endif