From patchwork Sat Jun 22 05:02:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengdun Wang X-Patchwork-Id: 92706 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B4EE8382FAF4 for ; Sat, 22 Jun 2024 05:03:41 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2082c.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e88::82c]) by sourceware.org (Postfix) with ESMTPS id DB2863858C98 for ; Sat, 22 Jun 2024 05:03:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DB2863858C98 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=live.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=live.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DB2863858C98 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=2a01:111:f400:7e88::82c ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1719032598; cv=pass; b=KkXrMq2yKDM8jgX/5gvcHzSgey0ybr4pcWS0FX2B61QNhrfNw4ZMNgUM5l7kUgcTL9ozVsngHu2WzrAW/lxQvenPz8KL/JX6SB5PHcoeEISdFY46gsorMOceDAoHN2VAlpNpmN3eRxivQrbNK9rMpyB0OyKH78jmWoujJf+2L6s= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1719032598; c=relaxed/simple; bh=cwLeMHEVboOeuAv46kn/7epecJgcWwtKNHTjVeinL5A=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=CDaA/6ES67DISomOGEa2JZBBX13RQOAKE23bmuvkGcVqxJMIpx3V1diRA0Z3hMxdfB7/S0Z3dCO6BWkFrxnfLqGU8LJaTRquqq2PJSui1GyojVmQZ2oilL4dIqgvpKdradNg3fWugrQNWCXHACzc4tRYeSfwpHgPz1sszIlqTn0= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WsZLDGuYsqiE+OmFKqs82DBYdOhgY0a5ovNJbYzNGrfhKeH07oNE87EskN2fS6yXrD5lv6kyfaxo7pkplVSDa/iGtsiXu8h8wJnAAnzOgadmHtRulqm2PyhpRwEH3R4+vOqMyW9DKwwe+gIe2MClHIqSK2pM6tA7WlNFg8cPE7eYZpYCUUks6WSaSo+HiD+cVsRf6EiUzSOT52B/hiRoFaDw9mPzAYZIYQcOu17NHnneBRxzIo6qXTdD7NdwbvvhfucaT3YmWKLLuMyVoNMfprvxGb4zEudNxrNvap8nwoiNgyLLSQ7Ix5aO6EThbjFQ/uVM07oCLBDRBHd5fPNgdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lj7u+v2twOrHZO6r9CyEPC38Cd6vbXp0U+s+ev71Ta0=; b=d7/F1x+OVm/hNGu+Lp/mvLfKxlqM9enqdcnk+YOFXVoDwrAJOUp6bcdLzrCgrRAH5xCZDvUoDCDw+/kN/a8716ympj1hGHPX+yyWp0CfMQAZ2owqeumKw1EntBVRzcf2Y8q2uPw7bzYAdZ+jNiTIFQBy1FbAzFOxtQM+jc43PIoOA/zjA6aP+tEQ23pweHRZ3DTx8iFKGGJr8d4IQad9nFpr1l4SbZ5M1m/OXSc1ib8ehBDJy4RDB/lR0aRRStA6+smrP9MefBmaRp1+qk5a7KC3c8wY+6tHm4BWZ82ijWFl7j5I1o48TWq4vuBb36/52b66jR2kFu7rYHu3RvNKTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lj7u+v2twOrHZO6r9CyEPC38Cd6vbXp0U+s+ev71Ta0=; b=IqThf9Ir4QjMguOUsInU4lajtisoynYO6e4wpMT4kQ8Wbejs3vu6iEu1GkAqre2tN8JivDDy3Vi/jTlmLTU0COUk5aa5+o+nnRGWaCzijkS8lPe98RHrP09AHPK3fOwUhd8K9u+L/Bz78i0L4MRK+7KHYN6l1oDh1pM2hC9d47h0cpGZ1n0/i/P+WVbZiJbvTl94fq0QPFgtMmtTPh60yZkUi4SnitSbGhhJK2x9Zu8RCZAcFSzMEcqCBu/NyGdjE89iXu/vDRKqwZXk2VV+iIS9DAnvnU6K+yL7ZvNUzNgW39XL4fHR8OXLH13leWIgWcEbQeCFrGWbRJTAFu0xnA== Received: from SA1PR11MB7130.namprd11.prod.outlook.com (2603:10b6:806:29f::10) by SN7PR11MB7089.namprd11.prod.outlook.com (2603:10b6:806:298::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.20; Sat, 22 Jun 2024 05:03:10 +0000 Received: from SA1PR11MB7130.namprd11.prod.outlook.com ([fe80::928e:8882:8562:2dd5]) by SA1PR11MB7130.namprd11.prod.outlook.com ([fe80::928e:8882:8562:2dd5%5]) with mapi id 15.20.7698.017; Sat, 22 Jun 2024 05:03:10 +0000 From: trcrsired To: gcc-patches@gcc.gnu.org Cc: trcrsired Subject: [PATCH] [PR115585] Fix --disable-libstdcxx-verbose abi break Date: Sat, 22 Jun 2024 01:02:11 -0400 Message-ID: X-Mailer: git-send-email 2.45.2 X-TMN: [Ds/tpfZcDlXOMw02c9DQv4xd+xsInD++CYrPmyAFoPQ=] X-ClientProxiedBy: BL0PR02CA0017.namprd02.prod.outlook.com (2603:10b6:207:3c::30) To SA1PR11MB7130.namprd11.prod.outlook.com (2603:10b6:806:29f::10) X-Microsoft-Original-Message-ID: <20240622050226.575074-1-euloanty@live.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA1PR11MB7130:EE_|SN7PR11MB7089:EE_ X-MS-Office365-Filtering-Correlation-Id: d2895c43-967a-4bc8-0f8d-08dc92789c75 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|440099025|3412199022|4302099010|1602099009; X-Microsoft-Antispam-Message-Info: UUGnj456f7PEgnITBxUnM02KzXA7rAJEr+uWlvrIa3BOLpTY0/5yzlfq9D2khJCFF3nP9BSJ0+bLEpWENbOi/GbI2es/QyB4T+eD9BPNZknqBx/fhVbGv4jSInCulMpnIkyEzBfOlUJ/FM7otlBVPyZoIqoBcMueDGKiag6a0WyC9+SRVWmsqnNJsjdd+2EwmAlBF/gKvawexZIS4O8UbUCeIEY9s+p+v0phLX6eealwvcwaMlJ+poTTCLDHO599QP8kg3r5SU+uASvTXn7wIo2l6ePDPtawa0NwhkdIwxnehXebkwyh+J/qEHdo0dXv2zGlsp4MSvd216eXWkxBtMbkIuCxAGmW2F819w36F8bfQE96fhxcCrpfp8YucqnjQLGgTsp7SVI49KC+yRMh4osWyVmrNrTuWXy+cGUE6jUWBKb8YDuqXcP0+X87dRGJqzN44dGlQlK7h1D5rv5Qa4JSXJ8PuCu8cExFKnC6q9fPBK2xuTTt/yxigV+dczOeNCmJCfsoDgLKO10Xytj1QNr/n9BRPA4SmAoqddGMyUrjgUiHrFXuMOL2AYPPQeXysuUIyRZeaLWQ8ONaskjZbgozZHfzF+k1Ya/6CoUcNfV6WJzgM8YYs2NlWmNJIuobVI0lenqot+kFtdSdJBjYGDNMFzufUOjbdcklsSe1dDLM+HounQ8icvuzBiZFc/kb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FyNypJolCSj3bhvlSAcJSaWK+1eOGJzAY3g1LvT0Hdik2FgE8qh1dJGxJh6RS1BJ1X16pMNrGYof60WJxXuK3oV0AvYLwbGWrjuwZ0wBSmOSmvF85N+/kdKah4GWZ7qCNY8NjXBUbnVnzjuPr1nHkFlLMXmGe1r7zVV4yf4jI9i1HmBeOzdRkwENqcEYgBEnwMlfwXX4hvjTe/SRPifu5xEvt9/+6SjYt6Qh2QM8vBsLeemR7qqo4zOdT/omQVYOIlLEXT0qySUcDheBqrJAb28yi4W6Kd+erC0GtOOVdFKilZL9Gk1XNHb0BKKyEUwbeqqK6SkNlVXpG2SH4kLGIXjvTaAt73Tiinj8AJGtWWsjwln1Z+njrBFkgwJOKP4bGkHqIuNoFza2ccxp4vuAKxsxrDToLe/ChdgqHRuX/anAXFFdZsaee8ZB55yq/f1ucw8SjSkw5CNFnY4c1nS/hr1P/Z2+oiL+QjtqqlTDKbJxqC8LXcmBWgmhbxPxDusCLhTQny243XAgVug0UNh+KGgjFCTVaL6DMIAdWTn2WxwE6aUNiEgWGrrZARYF7TMgxTcF3thWYZ0bkmuFGKEpWROIsf2bMsbdjwgUxutJLtXeWGFWA17bjpHbdsYpJZwABhLNaH7q8d6X2ongBr4W60a1kg4KbWZiRAtqLI2tPArcKFeaTXDKmA/QhhgSZSytfBuhvCavM6+eCWdAmqzgt+dGzWYWm+eUQTJlP/iRvqR7XwR4T6k9zZ6nPMvUdptrnj5fNcTSIW3J2Kml2yQxFoDWnSNlDA4jq8MGWyIF0uDL1nSwXejaHhbjHVq66xmSEgW/+WFD06L1XEajg0gGDUPVC1xCRsfeqgIIjPgy/rRj4a6atUrI9zHb3AEt9K4fESVYFt4aerrcvVm5uAaouIKRNlRnXkI2yU7FYQM89KOCC2pwgitFZVTqGdtqiWzg1R63PQFt6eHdO/YQ32SP8SBoLrdd1aCu/N5QhQxxydWA/u8PnOm3L6gsRjDH9LDV+L6ddGh9KsHwcaGQg/VwdyclUYoAGc8VOvUkmFXnhaGA7uE4vVCZp0ZpCOSbSvYfOb8gDQzx7M+EIgBSoXMTbHLRsd9RGFywZzsTf2DRXzLCyePyp3CYskuH5kGTClAkzuzn7InJQ3qtzXo7is9Vkrk1AQOFQX5kiL9lq9gWJfp4i88+68GOB3sioA1+IY6kKIEOPGlF3QkMsgdMuAgUId/+QyYWJKQj5Eto4R3kRTs= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-e8f36.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: d2895c43-967a-4bc8-0f8d-08dc92789c75 X-MS-Exchange-CrossTenant-AuthSource: SA1PR11MB7130.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2024 05:03:10.1530 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB7089 X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org From: trcrsired __glibcxx_assert_fail is not defined when we disable the libstdcxx-verbose. This causes ABI break when a binary is compiled with verbose enabled. Add bits/c++config.h before headers in assert_fail --- libstdc++-v3/src/c++11/assert_fail.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/src/c++11/assert_fail.cc b/libstdc++-v3/src/c++11/assert_fail.cc index 6d99c7958f3..60fd5ddd210 100644 --- a/libstdc++-v3/src/c++11/assert_fail.cc +++ b/libstdc++-v3/src/c++11/assert_fail.cc @@ -22,23 +22,26 @@ // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // . +#include +#ifdef _GLIBCXX_VERBOSE_ASSERT #include // for std::fprintf, stderr +#endif #include // for std::abort -#ifdef _GLIBCXX_VERBOSE_ASSERT namespace std { [[__noreturn__]] void - __glibcxx_assert_fail(const char* file, int line, - const char* function, const char* condition) noexcept + __glibcxx_assert_fail([[maybe_unused]] const char* file, [[maybe_unused]] int line, + [[maybe_unused]] const char* function, [[maybe_unused]] const char* condition) noexcept { +#ifdef _GLIBCXX_VERBOSE_ASSERT if (file && function && condition) fprintf(stderr, "%s:%d: %s: Assertion '%s' failed.\n", file, line, function, condition); else if (function) fprintf(stderr, "%s: Undefined behavior detected.\n", function); +#endif abort(); } } -#endif