From patchwork Sun Jan 7 01:00:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 185704 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp345034dyq; Sat, 6 Jan 2024 17:05:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IHjx13Trb/+wk8kW1OM6M9cTYCdXi84A1qOqnoFmaT2vkat36wrVLpODoSfIBymPBRSIxjZ X-Received: by 2002:a05:6214:1c43:b0:67f:67e4:f289 with SMTP id if3-20020a0562141c4300b0067f67e4f289mr2491120qvb.4.1704589500307; Sat, 06 Jan 2024 17:05:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704589500; cv=pass; d=google.com; s=arc-20160816; b=jMg9wVzRJ2QiIY2pYO0VMrXLnuCa3mqhCshrxj3ZylFe8gWHQqrupwVKxlCJK/G6gj /3fJKgmyFYKK208OKoOB7jQ2XdurBlO27cuAM6OnDSS+dMl+mRipqvKwGqiiCYBdpYBJ 7+qlHLYlyPXXrp/z1nCkQvgyTyxjvLWa3O3jVp4u3w6DbjRCXq0QqIqSdHEVUAfUw+Kb GC9yh5fLGCWUi6w3NsTjAuPPcvRcf7Z9+orQnHoDc9AQZ8/tPUQvJmsyfHhiY6Ja39yA 3ffH6b+eYXU7sAPrzxHmCAJCRcTDl+mhaq505l8O46CbhV9zMLatNTSkRGkLB7iOS0P7 osCA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=f7V9+BEPvKKRuk85Vo2ZiWD9P+IX4vHMaqoexBO/iWk=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=QuLXNDm3Iy7iJWWWIo9LNYjBFhRkfUSG1FMFd9coAy6+6xynPmfSGfiMWD8FyuuZzW pnTh/OJBomk6UWC1NjA9SVQW0ZNT9i74EKwdeneGMmkSBG4RSTLNHCB1h/KMA/4CQTGQ xsljRfn3d61W2+vbWu8IJUjVMH5KWqn9m/gTSQlgZOLxE62XVueVbX2RhIlN/QiazI/P FLtaRqx2xIO6SvZI251QZd3kEftU6Je5XBI70hcE851EAsv+5AnHWxGvY9/07EgTuFQ+ KJcOufnyfkpgzR53D8RubAXmKmSpaH8jM598FwZeRDbgaX58vcEbCTZdqr/olDikKqqx ACMQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SesSz9av; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id dv18-20020a05620a1b9200b0077f0af0f019si4940592qkb.71.2024.01.06.17.05.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jan 2024 17:05:00 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SesSz9av; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 51DF8384DEC0 for ; Sun, 7 Jan 2024 01:04:59 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 B4F213858C2D for ; Sun, 7 Jan 2024 01:01:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B4F213858C2D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B4F213858C2D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704589270; cv=none; b=IY7wafSzGcFNLN2msNaxUZUgdo4OcvnXSGOLGcHiPJF48QrVZOdFHcBOn66vK/uzcJQJONLTSH8bVMorTO3QQ/Drx5NlNu4PDaKHCbLtdkrvHuA3cGeGYSUBSM7sTlO3Sir2qg2s3kmhypRnw6RGpZCDITISB5pQOchCktVCxOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704589270; c=relaxed/simple; bh=Tq5on9mov+DEbZkLuI5TB53Sqh4lCyMKOmj8fdkqohM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=wOkNKwGbrz+26bFxLfOKVtDv9YjDalCzJpVgenbw2/t9yTZDrA70dh1pc5bcXPHznpjL60uoD3snsyDlgQ4BvTKTmejqOotey6Jwc5+a3NC/qDZ3lsLvsKExZOqrdTfz1Vf8MEH4TYhMAUdpd4lx2GH+WSK5ANzRTpDsA+i32KI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704589264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7V9+BEPvKKRuk85Vo2ZiWD9P+IX4vHMaqoexBO/iWk=; b=SesSz9avNPejikmvETRXFepBTWbWLjWWcXOmEUhOdllxLBMowMWheJbF4Rc/a6EGd3htsS IJaUKP4p3jbvpxLUnaxRgWRHS22xktmJptm5ennZZW5q+YuV8wGAQejkwLH5DTBQYheR/E bhyZ0ZMBrViSh4f3Zkr2EN8DasYZQ3U= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-5-eYLcErX1O9KkHXK2PIgQRg-1; Sat, 06 Jan 2024 20:00:57 -0500 X-MC-Unique: eYLcErX1O9KkHXK2PIgQRg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 77CFF85A589; Sun, 7 Jan 2024 01:00:57 +0000 (UTC) Received: from localhost (unknown [10.42.28.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42044492BE6; Sun, 7 Jan 2024 01:00:57 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Avoid conflicting declaration in eh_call.cc [PR112997] Date: Sun, 7 Jan 2024 01:00:51 +0000 Message-ID: <20240107010056.3402724-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.1 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_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787391639666425251 X-GMAIL-MSGID: 1787391639666425251 Tested x86_64-linux. Pushed to trunk. -- >8 -- r14-1527-g2415024e0f81f8 changed the parameter of the __cxa_call_terminate definition, but there's also a declaration in unwind-cxx.h which should have been changed too. libstdc++-v3/ChangeLog: PR libstdc++/112997 * libsupc++/unwind-cxx.h (__cxa_call_terminate): Change first parameter to void*. --- libstdc++-v3/libsupc++/unwind-cxx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/libsupc++/unwind-cxx.h b/libstdc++-v3/libsupc++/unwind-cxx.h index f7eef0da6e2..abc8b808f26 100644 --- a/libstdc++-v3/libsupc++/unwind-cxx.h +++ b/libstdc++-v3/libsupc++/unwind-cxx.h @@ -167,7 +167,7 @@ struct __cxa_eh_globals // throws, and if bad_exception needs to be thrown. Called from the // compiler. extern "C" void __cxa_call_unexpected (void *) __attribute__((__noreturn__)); -extern "C" void __cxa_call_terminate (_Unwind_Exception*) throw () +extern "C" void __cxa_call_terminate (void*) throw () __attribute__((__noreturn__)); #ifdef __ARM_EABI_UNWINDER__