From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id EC05F3861834; Tue, 15 Dec 2020 11:45:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC05F3861834 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-6072] libstdc++: Use init_priority attribute for Init object [PR 98108] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 0feb237657c7c1f057754a8d8132a83adc63250e X-Git-Newrev: cf4ed3b41594b6935a337fe0aaf8149eadf88751 Message-Id: <20201215114549.EC05F3861834@sourceware.org> Date: Tue, 15 Dec 2020 11:45:49 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2020 11:45:50 -0000 https://gcc.gnu.org/g:cf4ed3b41594b6935a337fe0aaf8149eadf88751 commit r11-6072-gcf4ed3b41594b6935a337fe0aaf8149eadf88751 Author: Jonathan Wakely Date: Tue Dec 15 11:40:06 2020 +0000 libstdc++: Use init_priority attribute for Init object [PR 98108] This causes the global objects that run the initialization code to be constructed earlier, which avoids some bugs in user code due to incorrectly relying on static initialization order. libstdc++-v3/ChangeLog: PR libstdc++/98108 * include/std/iostream (__ioinit): Add init_priority attribute. Diff: --- libstdc++-v3/include/std/iostream | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/iostream b/libstdc++-v3/include/std/iostream index f988342b90a..6b2f964f688 100644 --- a/libstdc++-v3/include/std/iostream +++ b/libstdc++-v3/include/std/iostream @@ -70,8 +70,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif //@} +#if __has_attribute(__init_priority__) +# define _GLIBCXX_INIT_PRIO(N) __attribute__((__init_priority__(N))) +#else +# define _GLIBCXX_INIT_PRIO(N) +#endif + // For construction of filebuffers for cout, cin, cerr, clog et. al. - static ios_base::Init __ioinit; + static ios_base::Init __ioinit _GLIBCXX_INIT_PRIO(90); + +#undef _GLIBCXX_INIT_PRIO _GLIBCXX_END_NAMESPACE_VERSION } // namespace