Fix libstdc++/64883 for Darwin.

2018-12-24  Iain Sandoe  <iain@sandoe.co.uk>

	Backport from mainline
	2018-12-06  Jonathan Wakely  <jwakely@redhat.com>
		    Iain Sandoe  <iain@sandoe.co.uk>

	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 de26ed1c0959a7501bfcc79d752b5f9969da3539..b2c06d1d685d1b0588fe0b855f99150cfee97b1b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,17 @@
+2018-12-24  Iain Sandoe  <iain@sandoe.co.uk>
+
+       Backport from mainline
+       2018-12-06  Jonathan Wakely  <jwakely@redhat.com>
+                   Iain Sandoe  <iain@sandoe.co.uk>
+
+       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  <iain@sandoe.co.uk>
 
        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 6d6d79803969e2c7edc1a10cdf2da3b08bb9cab8..f5d1d4563b34490f98b4c445ce2e34667a15ffd3 100644 (file)
--- 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 415ece0296f33f7e8388e5c2f568d4b66c2c7dd6..ef7b14a5919f97ed622e3f9eca36909d8f913459 100644 (file)
--- 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 d4ef52412a3c5e10a7c54788f3c17d69384096c8..0f15e9cdac506beaa4994d71c5e1ede80d84da1e 100644 (file)
--- 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