From patchwork Sun Oct 29 21:11:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Fran=C3=A7ois_Dumont?= X-Patchwork-Id: 1856783 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Xr15UIaq; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SJTbq4kSpz1yQK for ; Mon, 30 Oct 2023 08:11:33 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5827238618DE for ; Sun, 29 Oct 2023 21:11:31 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id A005C385828D; Sun, 29 Oct 2023 21:11:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A005C385828D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A005C385828D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::330 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698613881; cv=none; b=G1xra5J/3ouD5FEjJ2tLRyqnARdZXN8IA3g7y/nL0D0DkB463TuJUw9FkoFBDtc1PzLvkVqwUHqIc3U4N3xD7xuBwNFyJtlxH6CL6iL4YxapVsiscuZ7YYFn1YcRLoUmskIoVH0U47PQgvb8/qjRdnVYaYZbc1vsmQloWgMdb+E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698613881; c=relaxed/simple; bh=gOUBqabgU3WFa3/Q9or8cPYkmAUCftdquM40voKzYBA=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=hGqnRLtN3vzAxX9Ef6EIQbScPDRZDV1gZcovS2Mb19/fZFdps2lao9QdJILQe9Iw1t4Q7BuFQhp2fCHJ/5L8gjc57L8ipkn0qeFXhQm/hbg/TdzSTVs3pLbPCgDTq6EDQCwiYyj3vBSHlUbtID35vgFnsc5D7zqN24hC6fobuvk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40836ea8cbaso29571465e9.0; Sun, 29 Oct 2023 14:11:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698613877; x=1699218677; darn=gcc.gnu.org; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=AosM2T8yx9Sw4Baa8BazXHu+j3s0zX623FbNei7gOJU=; b=Xr15UIaq3LSpWDH7CAVI8nfM7vh+cqpw5s5+tQgmvTeZf+lHPtF6OwyciH+KLmRV1p NSzhM2lylXiwAvxHFAJ5aR0PCc5FJH0hVGwlNUuY+7AlnRdeyO4OqcgGj3XD7hVhXmM+ ULFg3i89PlDqsKoRPJEYd7lcHL0X9We47riUW/ZF8x9ZtG2V/xPE5tWV6piQ/rBYGGB2 siKbr+CfmlXoMg236871R2bC1bdGy/4IayHGqAyhtZgXn0ehFdSMnXcY6eC5dOpmhidg ClJWta7X8jEP+wMEIa+fpznpfuPtwOhfvJg9whgN8hM+D8DH/KgkiavKozE4whDSZTWv x7Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698613877; x=1699218677; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AosM2T8yx9Sw4Baa8BazXHu+j3s0zX623FbNei7gOJU=; b=Ra7azeaPL7+xJvM2hLoSAAtZTPEDDE/Pscrv/bgJQhIEb8Fi469RL1HCX+1YqKyKv9 XtFpqKKtBNbI2OSNeVXooQ9tARl6F/c/ktAD4bhgyzWeoe+jZkU+rH4sBIv3FPXv9TKZ G8CuVMwMeSIofM+3RBCPnfO7GtBKdJN7jYAvW+QS0c3bgDhc82QU4vFN64R65cgjmKp7 f+1saf7rOXQE9pKBngXM1YMeg9b5X7MF5nF/Uov5sfNlIpFB42I+udX40iNu8iXgJ9D7 9dpN//+UHAG99/xsgnuygUgsBJCF7L4Z1bTMcLiH/PTbjVTUVoUJGdHggdX0VlrJ2yM+ VDVg== X-Gm-Message-State: AOJu0Yy97PuX07oYIJ8F4ir+vmZzdmMk7tAroABofsrDBG+Ia3ftESYQ 7sgRloX9ny9mYzrKL1iSqBbDryhdXF4= X-Google-Smtp-Source: AGHT+IEorJ5n3xFPAYit0gx9KoAiS8iz8HhEEQszZuflleTMGN6H69ILhLCmJK3Js8y2Z8jSzM5L7Q== X-Received: by 2002:a05:600c:1c90:b0:405:37bb:d942 with SMTP id k16-20020a05600c1c9000b0040537bbd942mr6852029wms.4.1698613876679; Sun, 29 Oct 2023 14:11:16 -0700 (PDT) Received: from ?IPV6:2a01:e0a:1dc:b1c0:1b3f:1348:b8b5:6b0? ([2a01:e0a:1dc:b1c0:1b3f:1348:b8b5:6b0]) by smtp.gmail.com with ESMTPSA id f7-20020a7bcd07000000b003fee567235bsm10865013wmj.1.2023.10.29.14.11.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 29 Oct 2023 14:11:15 -0700 (PDT) Message-ID: Date: Sun, 29 Oct 2023 22:11:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: libstdc++ Cc: gcc-patches From: =?utf-8?q?Fran=C3=A7ois_Dumont?= Subject: [committed][_GLIBCXX_INLINE_VERSION] Fix constract violation X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org This fixes handle_contract_violation under versioned namespace mode. Tested under Linux x64 and confirmed to also fix Darwin build. libstdc++: [_GLIBCXX_INLINE_VERSION] Provide handle_contract_violation symbol libstdc++-v3/ChangeLog:         * src/experimental/contract.cc         [_GLIBCXX_INLINE_VERSION](handle_contract_violation): Provide symbol         without version namespace decoration for gcc. François diff --git a/libstdc++-v3/src/experimental/contract.cc b/libstdc++-v3/src/experimental/contract.cc index 504a6c041f1..d550b49c4eb 100644 --- a/libstdc++-v3/src/experimental/contract.cc +++ b/libstdc++-v3/src/experimental/contract.cc @@ -67,3 +67,11 @@ handle_contract_violation (const std::experimental::contract_violation &violatio std::cerr << std::endl; #endif } + +#if _GLIBCXX_INLINE_VERSION +// Provide symbol without version namespace decoration for gcc. +extern "C" __attribute__ ((weak)) void +_Z25handle_contract_violationRKNSt12experimental18contract_violationE +(const std::experimental::contract_violation &violation) +{ handle_contract_violation(violation); } +#endif