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 B64483858D1E for ; Sat, 5 Mar 2022 20:34:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B64483858D1E Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-311-G52VZjwzPZCRpaQViIpJPA-1; Sat, 05 Mar 2022 15:34:35 -0500 X-MC-Unique: G52VZjwzPZCRpaQViIpJPA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D90131091DA0; Sat, 5 Mar 2022 20:34:34 +0000 (UTC) Received: from localhost (unknown [10.33.36.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88A92305AC; Sat, 5 Mar 2022 20:34:34 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Ensure __glibcxx_assert_fail has default visibility Date: Sat, 5 Mar 2022 20:34:33 +0000 Message-Id: <20220305203433.1301089-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-13.6 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_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Mar 2022 20:34:42 -0000 Tested powerpc64le-linux, pushed to trunk. -- >8 -- This ensures there's no linker error if libstdc++ headers are included following a pragma that sets hidden visibility. Similarly for std::__terminate, which is always-inline so shouldn't matter, but it's not wrong to do this anyway. libstdc++-v3/ChangeLog: * include/bits/c++config (__glibcxx_assert_fail): Add visibility attribute. (__terminate): Likewise. --- libstdc++-v3/include/bits/c++config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index c64b61b3c90..6c134f13509 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -305,6 +305,7 @@ namespace std // This allows the library to terminate without including all of // and without making the declaration of std::terminate visible to users. extern "C++" __attribute__ ((__noreturn__, __always_inline__)) + _GLIBCXX_VISIBILITY(default) inline void __terminate() _GLIBCXX_USE_NOEXCEPT { void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__)); @@ -554,7 +555,7 @@ namespace std { // Avoid the use of assert, because we're trying to keep the // include out of the mix. - extern "C++" _GLIBCXX_NORETURN + extern "C++" _GLIBCXX_NORETURN _GLIBCXX_VISIBILITY(default) void __glibcxx_assert_fail(const char* __file, int __line, const char* __function, const char* __condition) -- 2.34.1