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.129.124]) by sourceware.org (Postfix) with ESMTPS id A9B5B3858418 for ; Tue, 18 Apr 2023 16:13:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A9B5B3858418 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=1681834413; 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=JtcpKAx4jGH6k2y/A3TTjSD/m2q13PIx/+VEDwF6sCY=; b=hUsCyTxek9ZZo946DndXmmomsx4mLQsRaaXfPm35cuZG+QFG15Ef4UbT99kCNrSzxI2WmW 1BpdqFzhUhDwYHoPDnCfh5lV6poiR5BIB1Lj9thCpvIQr6lcp/jze4TDPVRBCUZu0FcyP+ 5/s7YEjIVJCCxDVQfbSUq457ePE5Euw= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-c2SGElXMMiCKCX8zbiMrWw-1; Tue, 18 Apr 2023 12:13:31 -0400 X-MC-Unique: c2SGElXMMiCKCX8zbiMrWw-1 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-4edb2cd7860so879865e87.0 for ; Tue, 18 Apr 2023 09:13:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681834410; x=1684426410; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JtcpKAx4jGH6k2y/A3TTjSD/m2q13PIx/+VEDwF6sCY=; b=PoFKxfPp5A/Dm7r982dVNgold9Mdb4T3ijtinrwXwO5Xevbk5GqwhOMzPo9Xjyf3/d ZAYQBh/+hqetgLrW5ew7QFV9Ty1NGEnuYHqYm0ajtKLtl1C5ND0V0BdM6DDYlfAJLp0p jimGGhLS6MzMMc0WmKEe+/f+O+1KMx786g46j1n2vSSb+jAQYLOZBpf82iUNekkQbDwk ffubexVCjmIgaB27fhFwHDXpTAGwbKiDf5WdDqtoC5u0GW5dv21Ehuo9jh32TCWfC1LE O7FI+ufOW+tXFYnUJ4t98JZZvw52jjGVcNeajt6y7FmgZedME1Qq84enmBcRc21VkEmK LiFw== X-Gm-Message-State: AAQBX9eDoIuRklv/JE27U6v2G2fY4ZoOPxJ/irLg/c5dmnV0G6t8L2/+ fmA3b83+wuc7j4Wj/dlIGw8+gqIWmRd/Htlb2h+hA1Ma68g4Z95OFpMIiEGxZqUjF0uIJTHq9uc bM8Mjbw85FYGt2RaLLzW87SDw3UD1OsKLGQ== X-Received: by 2002:a19:f002:0:b0:4eb:3b60:a642 with SMTP id p2-20020a19f002000000b004eb3b60a642mr3371723lfc.8.1681834410347; Tue, 18 Apr 2023 09:13:30 -0700 (PDT) X-Google-Smtp-Source: AKy350aKh297jIYrn+u8BZQ3SIyzQC7GS6cszspsAtRAmAZ9L3tGtSn+46tK7sFvMAtcBqfedoxbik3r1wgpMuCq7Ro= X-Received: by 2002:a19:f002:0:b0:4eb:3b60:a642 with SMTP id p2-20020a19f002000000b004eb3b60a642mr3371715lfc.8.1681834409995; Tue, 18 Apr 2023 09:13:29 -0700 (PDT) MIME-Version: 1.0 References: <20230418155914.545421-1-jwakely@redhat.com> In-Reply-To: <20230418155914.545421-1-jwakely@redhat.com> From: Jonathan Wakely Date: Tue, 18 Apr 2023 17:13:18 +0100 Message-ID: Subject: Re: [committed] libstdc++: Export global iostreams with GLIBCXX_3.4.31 symver [PR108969] To: Jonathan Wakely Cc: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_STOCKGEN,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 Tue, 18 Apr 2023 at 16:59, Jonathan Wakely via Libstdc++ wrote: > diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver > index 4ae63094eb7..7c015524b62 100644 > --- a/libstdc++-v3/config/abi/pre/gnu.ver > +++ b/libstdc++-v3/config/abi/pre/gnu.ver > @@ -2512,6 +2512,20 @@ GLIBCXX_3.4.31 { > _ZNKSt12__shared_ptrINSt10filesystem28recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE[012]EEcvbEv; > _ZNKSt12__shared_ptrINSt10filesystem7__cxx1128recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE[012]EEcvbEv; > > +#if defined(_GLIBCXX_SYMVER_GNU) && defined(_GLIBCXX_SHARED) \ > + && defined(_GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE) \ > + && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT) I've just noticed that these will never be defined, because this linker script is preprocessed with config.h not c++config.h, and so it should be: #if defined(_GLIBCXX_SYMVER_GNU) && defined(_GLIBCXX_SHARED) \ && defined(HAVE_AS_SYMVER_DIRECTIVE) \ && defined(HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT) The condition will never be true as currently written (which doesn't actually seem to matter, but Jakub says that re-exporting the symbols as the new version is needed in the linker script for older linkers). > + # See src/c++98/globals_io.cc > + _ZSt3cin; > + _ZSt4cout; > + _ZSt4cerr; > + _ZSt4clog; > + _ZSt4wcin; > + _ZSt5wcout; > + _ZSt5wcerr; > + _ZSt5wclog; > +#endif > + > } GLIBCXX_3.4.30; > > # Symbols in the support library (libsupc++) have their own tag.