From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 858873858D38 for ; Fri, 30 Jun 2023 14:29:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 858873858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688135340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=igH307TMjcxaq5hLW0Eg8cSPwnpO3pNsYe782Fp33VI=; b=GamsD1pAo8MN/5NOpCzfDhBJ5plmvRqDuJAs0Rct8UfDVyZC1t6bN6xu17rdkmMjrQn5kE yTUjNNOUJp+MSH4DS/jbWunHgEmLkirCeb5e/59Q77452SJUj+Y9V7396/lMSBWmV5BqI4 DXFFKFWoB3BQchpMq0JzhjCqRiTsuZA= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-422-u8ANjNcSOF6pGyoWjU7__w-1; Fri, 30 Jun 2023 10:28:58 -0400 X-MC-Unique: u8ANjNcSOF6pGyoWjU7__w-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7623d5cb0caso233425085a.3 for ; Fri, 30 Jun 2023 07:28:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688135338; x=1690727338; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=igH307TMjcxaq5hLW0Eg8cSPwnpO3pNsYe782Fp33VI=; b=XdKRYz1855HUT9wUgdvAdFOFau3gs9xZs+WIFUGKn3fwkA+m+6GBAQiNOqaGf8Qd8t ae0VhTIP2UGF2LOERpn3zwH9JMyr4/u8Dq8C+e+/XiKFluILYIjr6+wU6bLCDV4O0rw9 x+yCSRjHgDCQoBmMBH2aGnCufdd8RkKTHJbuJy74xye0IqtR746LTLHB/M0PMburbVTz WIiLNmUw+xTgCmB2iOlVgRPKa501WVdIshD3AW1qhfVNlkB89RnZ8parSmnU8jQQMJpE dALg5XDfkuxpA6kgHt4psshb/aT3FYepcuHYv74gp1G+jJbs3+zK1X7CFIL2aKoURhHM 3FCQ== X-Gm-Message-State: AC+VfDzaPuRoaf8Fqp90KeSFUra9Nrvotar/hAUIGbgpXf1dzQO8x7XI KDXv9dl+qWai+rqM1ONWHXPzBZwyFw4eQhINprN4IIXsxclGa1RQCOADcLsYvAz3/VxO9PiAfDO h24ZEoA4TSe0qPDA= X-Received: by 2002:a05:620a:298a:b0:767:178c:c456 with SMTP id r10-20020a05620a298a00b00767178cc456mr3330180qkp.40.1688135338430; Fri, 30 Jun 2023 07:28:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7q2zEQdv3087ADlV3gWbjd7AHyQemCh+V+5UP+aVlxMisysSbLvsGFO2JfukZYrshA6z/6HA== X-Received: by 2002:a05:620a:298a:b0:767:178c:c456 with SMTP id r10-20020a05620a298a00b00767178cc456mr3330161qkp.40.1688135338151; Fri, 30 Jun 2023 07:28:58 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id b7-20020a05620a126700b00767303dc070sm1700413qkl.8.2023.06.30.07.28.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 07:28:57 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Fri, 30 Jun 2023 10:28:56 -0400 (EDT) To: Jonathan Wakely cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org, Patrick Palka Subject: Re: [PATCH] libstdc++: Fix iostream init for Clang on darwin [PR110432] In-Reply-To: <20230630141131.716948-1-jwakely@redhat.com> Message-ID: References: <20230630141131.716948-1-jwakely@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Fri, 30 Jun 2023, Jonathan Wakely wrote: > Tested x86_64-linux. Patrick, PTAL. > > -- >8 -- > > The __has_attribute(init_priority) check in is true for Clang > on darwin, which means that user code including thinks the > library will initialize the global streams. However, when libstdc++ is > built by GCC on darwin, the __has_attribute(init_priority) check is > false, which means that the library thinks that user code will do the > initialization when is included. This means that the > initialization is never done. > > Add an autoconf check so that the header and the library both make their > decision based on the static properties of GCC at build time, with a > consistent outcome. > > As a belt and braces check, also do the initialization in if > the compiler including that header doesn't support the attribute (even > if the library also containers the initialization). This might result in > redundant initialization done in , but ensures the > initialization happens somewhere if there's any doubt about the > attribute working correctly due to missing linker support. > > libstdc++-v3/ChangeLog: > > PR libstdc++/110432 > * acinclude.m4 (GLIBCXX_CHECK_INIT_PRIORITY): New. > * config.h.in: Regenerate. > * configure: Regenerate. > * configure.ac: Use GLIBCXX_CHECK_INIT_PRIORITY. > * include/std/iostream: Missing ChangeLog entry? > * src/c++98/ios_base_init.h: Use new autoconf macro instead of > __has_attribute. > --- > libstdc++-v3/acinclude.m4 | 27 ++++++++++++++ > libstdc++-v3/config.h.in | 3 ++ > libstdc++-v3/configure | 51 ++++++++++++++++++++++++++ > libstdc++-v3/configure.ac | 3 ++ > libstdc++-v3/include/std/iostream | 2 +- > libstdc++-v3/src/c++98/ios_base_init.h | 2 +- > 6 files changed, 86 insertions(+), 2 deletions(-) > > diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 > index 277ae10e031..823832f97d4 100644 > --- a/libstdc++-v3/acinclude.m4 > +++ b/libstdc++-v3/acinclude.m4 > @@ -5680,6 +5680,33 @@ AC_DEFUN([GLIBCXX_CHECK_ALIGNAS_CACHELINE], [ > AC_LANG_RESTORE > ]) > > +dnl > +dnl Check whether iostream initialization should be done in the library, > +dnl using the init_priority attribute. > +dnl > +dnl Defines: > +dnl _GLIBCXX_USE_INIT_PRIORITY_ATTRIBUTE if GCC supports the init_priority > +dnl attribute for the target. > +dnl > +AC_DEFUN([GLIBCXX_CHECK_INIT_PRIORITY], [ > +AC_LANG_SAVE > + AC_LANG_CPLUSPLUS > + > + AC_MSG_CHECKING([whether init_priority attribute is supported]) > + AC_TRY_COMPILE(, [ > + #if ! __has_attribute(init_priority) > + #error init_priority not supported > + #endif > + ], [ac_init_priority=yes], [ac_init_priority=no]) > + if test "$ac_init_priority" = yes; then > + AC_DEFINE_UNQUOTED(_GLIBCXX_USE_INIT_PRIORITY_ATTRIBUTE, 1, > + [Define if init_priority should be used for iostream initialization.]) > + fi > + AC_MSG_RESULT($ac_init_priority) > + > + AC_LANG_RESTORE > +]) > + > # Macros from the top-level gcc directory. > m4_include([../config/gc++filt.m4]) > m4_include([../config/tls.m4]) > diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac > index 9770c178767..fc0f2522027 100644 > --- a/libstdc++-v3/configure.ac > +++ b/libstdc++-v3/configure.ac > @@ -550,6 +550,9 @@ GLIBCXX_ZONEINFO_DIR > # For src/c++11/shared_ptr.cc alignment. > GLIBCXX_CHECK_ALIGNAS_CACHELINE > > +# For using init_priority in ios_init.cc > +GLIBCXX_CHECK_INIT_PRIORITY > + > # Define documentation rules conditionally. > > # See if makeinfo has been installed and is modern enough > diff --git a/libstdc++-v3/include/std/iostream b/libstdc++-v3/include/std/iostream > index cfd124dcf43..ec337cf89dd 100644 > --- a/libstdc++-v3/include/std/iostream > +++ b/libstdc++-v3/include/std/iostream > @@ -75,7 +75,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > // For construction of filebuffers for cout, cin, cerr, clog et. al. > // When the init_priority attribute is usable, we do this initialization > // in the compiled library instead (src/c++98/globals_io.cc). > -#if !__has_attribute(__init_priority__) > +#if !(_GLIBCXX_USE_INIT_PRIORITY_ATTRIBUTE && __has_attribute(init_priority)) This should check __init_priority__ since init_priority is a non-reserved name I think? LGTM otherwise. > static ios_base::Init __ioinit; > #elif defined(_GLIBCXX_SYMVER_GNU) > __extension__ __asm (".globl _ZSt21ios_base_library_initv"); > diff --git a/libstdc++-v3/src/c++98/ios_base_init.h b/libstdc++-v3/src/c++98/ios_base_init.h > index b600ec3298e..f7edfc84625 100644 > --- a/libstdc++-v3/src/c++98/ios_base_init.h > +++ b/libstdc++-v3/src/c++98/ios_base_init.h > @@ -8,6 +8,6 @@ > // constructor when statically linking with libstdc++.a), instead of > // doing so in (each TU that includes) . > // This needs to be done in the same TU that defines the stream objects. > -#if __has_attribute(init_priority) > +#if _GLIBCXX_USE_INIT_PRIORITY_ATTRIBUTE > static ios_base::Init __ioinit __attribute__((init_priority(90))); > #endif > -- > 2.41.0 > >