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 A1DA43858C52 for ; Fri, 28 Apr 2023 08:36:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A1DA43858C52 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=1682670965; 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=tbm9H+4DMeV4RkfwvtqoSnQMjVtNJDWNE/TAudYLAqY=; b=alK0B3wD4wtG+oX0WQKyW5RQ4hO5LMX0AIPXCP/b94Y2nky9a+/cPwycKXTXnMjf8wh3JB a3Eow7VjGwjB5u6ViUzG0vDkBKRet8OErlGsVDtA5qy3b2JYziPJjctdJhBrOB31hpiaFn F8wERg1ZRTvpv4o+UrOLq+0AQoIlNws= Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-3-pYlxZh0JP9aTvve2gdthhA-1; Fri, 28 Apr 2023 04:36:03 -0400 X-MC-Unique: pYlxZh0JP9aTvve2gdthhA-1 Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2a8b2ff4379so39274581fa.1 for ; Fri, 28 Apr 2023 01:36:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682670961; x=1685262961; 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=tbm9H+4DMeV4RkfwvtqoSnQMjVtNJDWNE/TAudYLAqY=; b=BImID0If0/5cGSJn3yh6T38Qpzs4WJiqFEuE2bOjvo53jigXs9ilDlG2Ie4WurFkPQ 20yVHQ9jrhnoloklLvYKNoiFhKPgeZimBz/ThH3s8Ai2rP3Reg/ygZ6aPqGwjA24HbPG s65mjsyyTCdmymgTuh8k/1A8AW7Q9Ootj+tor6N071lje0gs1D+DMzfhRNWIxd9I7oFp Vkt/5kS7ZqECErW6mo+GDUsRCrJeAQPHFWhwgrnZe0gE/ON0ZWzN2lD0Rx7mLP62gmwo rd0OHq4Lf8O8w2zK6kv3VHmVP9LKzyxvOiq6AVqmuT9UOW0vCpQhM8ljnrQkdKDx3WrS Yurw== X-Gm-Message-State: AC+VfDyOxytNjWOdoNv5glf7UoCgRe1UzHF7BOnIvrDoMO1exZlKLH+p D7DjNSy3AmyqCBx+MmEKY4ytNq4v1JettFiIRjQA+UCPd39pTasrgU0PnKZkF3aao+2Ji0l0+vO P4b1ArErN+vuj4Hfio8gOKrjiwwV4Sko= X-Received: by 2002:a2e:2410:0:b0:2a9:f114:f166 with SMTP id k16-20020a2e2410000000b002a9f114f166mr1238836ljk.2.1682670961747; Fri, 28 Apr 2023 01:36:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4XOaioKvsbJGBJqTv/BUy9Dra/IrCBEOfEXefXx21KGfNhEkx9+JDUl9C9tJaVI4wM+/YRAe4xjN/sOGeADNk= X-Received: by 2002:a2e:2410:0:b0:2a9:f114:f166 with SMTP id k16-20020a2e2410000000b002a9f114f166mr1238829ljk.2.1682670961423; Fri, 28 Apr 2023 01:36:01 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Jonathan Wakely Date: Fri, 28 Apr 2023 09:35:49 +0100 Message-ID: Subject: Re: [PATCH] libstdc++: Another attempt to ensure g++ 13+ compiled programs enforce gcc 13.2+ libstdc++.so.6 [PR108969] To: Jakub Jelinek Cc: Patrick Palka , gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org, Rainer Orth X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="000000000000ee1ebb05fa615c1a" X-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,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: --000000000000ee1ebb05fa615c1a Content-Type: text/plain; charset="UTF-8" On Fri, 28 Apr 2023 at 08:34, Jakub Jelinek wrote: > Hi! > > GCC used to emit an instance of an empty ios_base::Init class in > every TU which included to ensure it is std::cout etc. > is initialized, but thanks to Patrick work on some targets (which have > init_priority attribute support) it is now initialized only inside of > libstdc++.so.6/libstdc++.a. > > This causes a problem if people do something that has never been supported, > try to run GCC 13 compiled C++ code against GCC 12 or earlier > libstdc++.so.6 - std::cout etc. are then never initialized because code > including expects the library to initialize it and the library > expects code including to do that. > > The following patch is second attempt to make this work cheaply as the > earlier attempt of aliasing the std::cout etc. symbols with another symbol > version didn't work out due to copy relocation breaking the aliases appart. > > The patch forces just a _ZSt21ios_base_library_initv undefined symbol > into all *.o files which include and while there is no runtime > relocation against that, it seems to enforce the right version of > libstdc++.so.6. /home/jakub/src/gcc/obj08i/usr/local/ is the install > directory of trunk patched with this patch, /home/jakub/src/gcc/obj06/ > is builddir of trunk without this patch, system g++ is GCC 12.1.1. > $ cat /tmp/hw.C > #include > > int > main () > { > std::cout << "Hello, world!" << std::endl; > } > $ cd /home/jakub/src/gcc/obj08i/usr/local/bin > $ ./g++ -o /tmp/hw /tmp/hw.C > $ readelf -Wa /tmp/hw 2>/dev/null | grep initv > 4: 0000000000000000 0 FUNC GLOBAL DEFAULT UND > _ZSt21ios_base_library_initv@GLIBCXX_3.4.32 (4) > 71: 0000000000000000 0 FUNC GLOBAL DEFAULT UND > _ZSt21ios_base_library_initv@GLIBCXX_3.4.32 > $ /tmp/hw > /tmp/hw: /lib64/libstdc++.so.6: version `GLIBCXX_3.4.32' not found > (required by /tmp/hw) > $ LD_LIBRARY_PATH=/home/jakub/src/gcc/obj08i/usr/local/lib64/ /tmp/hw > Hello, world! > $ > LD_LIBRARY_PATH=/home/jakub/src/gcc/obj06/x86_64-pc-linux-gnu/libstdc++-v3/src/.libs/ > /tmp/hw > /tmp/hw: > /home/jakub/src/gcc/obj06/x86_64-pc-linux-gnu/libstdc++-v3/src/.libs/libstdc++.so.6: > version `GLIBCXX_3.4.32' not found (required by /tmp/hw) > $ g++ -o /tmp/hw /tmp/hw.C > $ /tmp/hw > Hello, world! > $ > LD_LIBRARY_PATH=/home/jakub/src/gcc/obj06/x86_64-pc-linux-gnu/libstdc++-v3/src/.libs/ > /tmp/hw > Hello, world! > $ LD_LIBRARY_PATH=/home/jakub/src/gcc/obj08i/usr/local/lib64/ /tmp/hw > Hello, world! > > Bootstrapped/regtested on x86_64-linux, i686-linux and > sparc-sun-solaris2.11 > > On the last one I've actually checked a version which had > defined(_GLIBCXX_SYMVER_SUN) next to defined(_GLIBCXX_SYMVER_GNU), but > init_priority attribute doesn't seem to be supported there and so I > couldn't > actually test how this works there. Using gas and Sun ld, Rainer, does one > need to use gas + gld for init_priority or something else? > > Ok for trunk and after a while for GCC 13.2? > Yes, for both, thanks for the fix. After it lands on the gcc-13 branch I'll also update the manual with: --- a/libstdc++-v3/doc/xml/manual/abi.xml +++ b/libstdc++-v3/doc/xml/manual/abi.xml @@ -275,6 +275,7 @@ compatible. GCC 11.1.0: libstdc++.so.6.0.29 GCC 12.1.0: libstdc++.so.6.0.30 GCC 13.1.0: libstdc++.so.6.0.31 + GCC 13.2.0: libstdc++.so.6.0.32 Note 1: Error should be libstdc++.so.3.0.3. > > 2023-04-28 Jakub Jelinek > > PR libstdc++/108969 > * config/abi/pre/gnu.ver (GLIBCXX_3.4.32): Export > _ZSt21ios_base_library_initv. > * testsuite/util/testsuite_abi.cc (check_version): Add > GLIBCXX_3.4.32 > symver and make it the latestp. > * src/c++98/ios_init.cc (ios_base_library_init): New alias. > * acinclude.m4 (libtool_VERSION): Change to 6:32:0. > * include/std/iostream: If init_priority attribute is supported > and _GLIBCXX_SYMVER_GNU, force undefined > _ZSt21ios_base_library_initv > symbol into the object. > * configure: Regenerated. > > --- libstdc++-v3/config/abi/pre/gnu.ver.jj 2023-04-20 > 09:36:09.415371050 +0200 > +++ libstdc++-v3/config/abi/pre/gnu.ver 2023-04-27 17:58:44.599675359 +0200 > @@ -2514,6 +2514,10 @@ GLIBCXX_3.4.31 { > > } GLIBCXX_3.4.30; > > +GLIBCXX_3.4.32 { > + _ZSt21ios_base_library_initv; > +} GLIBCXX_3.4.31; > + > # Symbols in the support library (libsupc++) have their own tag. > CXXABI_1.3 { > > --- libstdc++-v3/testsuite/util/testsuite_abi.cc.jj 2023-01-16 > 11:52:17.495713257 +0100 > +++ libstdc++-v3/testsuite/util/testsuite_abi.cc 2023-04-27 > 17:30:39.651173917 +0200 > @@ -213,6 +213,7 @@ check_version(symbol& test, bool added) > known_versions.push_back("GLIBCXX_LDBL_3.4.29"); > known_versions.push_back("GLIBCXX_3.4.30"); > known_versions.push_back("GLIBCXX_3.4.31"); > + known_versions.push_back("GLIBCXX_3.4.32"); > known_versions.push_back("GLIBCXX_LDBL_3.4.31"); > known_versions.push_back("GLIBCXX_IEEE128_3.4.29"); > known_versions.push_back("GLIBCXX_IEEE128_3.4.30"); > @@ -251,7 +252,7 @@ check_version(symbol& test, bool added) > test.version_status = symbol::incompatible; > > // Check that added symbols are added in the latest pre-release > version. > - bool latestp = (test.version_name == "GLIBCXX_3.4.31" > + bool latestp = (test.version_name == "GLIBCXX_3.4.32" > // XXX remove next 2 lines when baselines have been regenerated. > || test.version_name == "GLIBCXX_IEEE128_3.4.31" > || test.version_name == "GLIBCXX_LDBL_3.4.31" > --- libstdc++-v3/src/c++98/ios_init.cc.jj 2023-01-16 > 11:52:16.995720625 +0100 > +++ libstdc++-v3/src/c++98/ios_init.cc 2023-04-27 18:34:46.121276617 +0200 > @@ -199,5 +199,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > return __ret; > } > > +#ifdef _GLIBCXX_SYMVER_GNU > + void ios_base_library_init (void) > + __attribute__((alias ("_ZNSt8ios_base4InitC1Ev"))); > +#endif > + > _GLIBCXX_END_NAMESPACE_VERSION > } // namespace > --- libstdc++-v3/acinclude.m4.jj 2023-02-02 09:53:31.745525704 +0100 > +++ libstdc++-v3/acinclude.m4 2023-04-27 17:27:51.071626279 +0200 > @@ -3841,7 +3841,7 @@ changequote([,])dnl > fi > > # For libtool versioning info, format is CURRENT:REVISION:AGE > -libtool_VERSION=6:31:0 > +libtool_VERSION=6:32:0 > > # Everything parsed; figure out what files and settings to use. > case $enable_symvers in > --- libstdc++-v3/include/std/iostream.jj 2023-01-16 > 11:52:16.968721023 +0100 > +++ libstdc++-v3/include/std/iostream 2023-04-27 18:34:07.479837226 +0200 > @@ -77,6 +77,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > // in the compiled library instead (src/c++98/globals_io.cc). > #if !__has_attribute(__init_priority__) > static ios_base::Init __ioinit; > +#elif defined(_GLIBCXX_SYMVER_GNU) > + __extension__ __asm (".globl _ZSt21ios_base_library_initv"); > #endif > > _GLIBCXX_END_NAMESPACE_VERSION > --- libstdc++-v3/configure.jj 2023-02-02 09:53:31.795524981 +0100 > +++ libstdc++-v3/configure 2023-04-27 17:29:13.263429963 +0200 > @@ -68652,7 +68652,7 @@ $as_echo "$as_me: WARNING: === Symbol ve > fi > > # For libtool versioning info, format is CURRENT:REVISION:AGE > -libtool_VERSION=6:31:0 > +libtool_VERSION=6:32:0 > > # Everything parsed; figure out what files and settings to use. > case $enable_symvers in > > Jakub > > --000000000000ee1ebb05fa615c1a--