Fix PR libstdc++/64883 Darwin headers use always_inline so don't test that

    Because darwin system headers use always_inline rather than
    __always_inline__ the libstdc++ test will fail, even if our headers only
    use the reserved form of the attribute. Don't test it on Darwin, and
    assume that testing on other targets will catch any accidental misuses
    in libstdc++ headers.

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.

Co-Authored-By: Iain Sandoe <iain@sandoe.co.uk>
From-SVN: r266863

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bfc1ae7fe59b63694323546333c4628c7c444146..72feab11d9dc0cd6f7ac911db060ba13f749b009 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+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-03  Edward Smith-Rowland  <3dw4rd@verizon.net>
 
        PR libstdc++/88341 - Complex norm doesn't compile with C++11

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 b6ff8c47d43f1da03b50641e2b75e2f85e66fc1f..0e7dcf736f247dee24c02c562958ce475f9c2294 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 33b759f7399bbad05b868803ac3146f989c8fe6d..82f372d8294a0f6471da2b70c60b0390e2eda250 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 dbea4feec55ecfc84bb6412e7f86f5a14dae5d73..d6cc2c9f9db89c1c4071d3e5b8bdc3a5772a14b8 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

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 0a92ae683a46ce41b420418e691ce4235a4bc803..a6eff0cc04c2accb15b5deadcda1db116f1264a6 100644 (file)
--- 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,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 this, see PR 64883
+// darwin headers use these, see PR 64883
+# define always_inline 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 766c7b686172ba8bbfb1c60ccc19b165ed55d9c3..2eb46ea36f82bcd10a4719e8af027ba4e479706d 100644 (file)
--- 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,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 this, see PR 64883
+// darwin headers use these, see PR 64883
+# define always_inline 1
 # define visibility 1
 #endif
 #define packed 1