From patchwork Thu Oct 6 22:19:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 1798 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp13272wrs; Thu, 6 Oct 2022 15:20:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4jFQ0xr8acmVas463Qf4j/RRGu4NxPF90Da151MrPut/e3SMKHyO5uZjwMJt4VoWxoYT6I X-Received: by 2002:a17:907:9717:b0:783:b2e4:23de with SMTP id jg23-20020a170907971700b00783b2e423demr1634566ejc.364.1665094804847; Thu, 06 Oct 2022 15:20:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665094804; cv=none; d=google.com; s=arc-20160816; b=nTlhn/arC2zfPwbfWOiq89ofq1UCGCHKOBOxdQJS9n7LePvMuy1iCbBWcoFWVxqgXZ LEtwLb3kwjvG9zJqmoiUJBq/Wu22kouFvCiFzhV/S/9YoiKYUMj82gtLEKU9YO33aqHR Lp5Ua02lWNUAHNOWvZDluzownS9I6qm223g7ujac62rnUB9pDKdPVemeReRoB4o/rotL BGNIruGSdFlpjuyCaDnS+qoTXhbpdFaWB3jrgjgNDK2UEm/Hv02bmsH1b8CoT6xoSeE+ QeORXPMhz2H7Tlb8Q7UoEDLBdWFyJt+neaU/zGkOOX5o/bSGbfWpRsv2FEQ3qiUhblBT Xtqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-disposition:in-reply-to:mime-version:references:message-id :subject:to:date:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=geU0I+MyLuoJujew6ljP4y3yITRdIaUzhHBq5/F79eM=; b=Jnq+VWBmsfilqHxYkc5keXJutsUd0HEQldxkWv8lvYoUxI4uug0ipE0Ai/fzxa3kCg SCnaB6jZEcff9xAJAEC22eRDaDBGIwjGBIA+RC9HRsA0QQiPieOQQEfkP9Dmn7q2dskA S6o39QhvdWBwe5IjnELrJ8/6vLhmOOgyoYd0dmJNfEaNkPrExqRYcE9UnIVnvaMaXAiy 1HxlTxHWbDET9r682Blx8+ZR5pPWQRKRgP5S6sf6fA7sEE7AvuYvtX1ouVZVxg59hX15 tu+QKL4Ds3AuJHQk+UAtVzMsbL/ilPUfq7/NpaZl/vGG3maFJNCjGt+PvKvxpRzGdnK5 zEFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FGvNg320; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id e18-20020a056402191200b00456fd2bb890si438709edz.564.2022.10.06.15.20.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 15:20:04 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FGvNg320; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A73D83839DD2 for ; Thu, 6 Oct 2022 22:20:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A73D83839DD2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665094803; bh=geU0I+MyLuoJujew6ljP4y3yITRdIaUzhHBq5/F79eM=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=FGvNg320X3e6vwFn8Gq2wiBw4/2BlrfXs9eeDtF7A30Qndt+/L2FB26DSagC924D0 xPY5qYXggbdwWEwDjIa0HbBBz81ctQBFP2phsqM0EeW2t82vhCSZ7IGGEHruNxQR+Q 8bYH9q94Ob1q+i3OZ2tw6RSXEhEjVbc2unk9eDVE= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id D6B533858D37 for ; Thu, 6 Oct 2022 22:19:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D6B533858D37 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-116-PoKDkDkaMfOeO77LVrwqNg-1; Thu, 06 Oct 2022 18:19:15 -0400 X-MC-Unique: PoKDkDkaMfOeO77LVrwqNg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C8862101A528; Thu, 6 Oct 2022 22:19:14 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.194]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 848D99D493; Thu, 6 Oct 2022 22:19:14 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 296MJBK62179181 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 7 Oct 2022 00:19:11 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 296MJATX2174844; Fri, 7 Oct 2022 00:19:10 +0200 Date: Fri, 7 Oct 2022 00:19:09 +0200 To: Joseph Myers Subject: [committed] libgcc, arc: Fix build Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Cc: gcc-patches@gcc.gnu.org Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1745978450035589550?= X-GMAIL-MSGID: =?utf-8?q?1745978450035589550?= Hi! On Thu, Oct 06, 2022 at 10:05:29PM +0000, Joseph Myers wrote: > I'm seeing the following build failure for arc-linux-gnu after this > commit. (Note that this is for building GCC *after* glibc, not for an > initial inhibit_libc bootstrap build of GCC.) > > In file included from > /scratch/jmyers/glibc-bot/src/gcc/libgcc/unwind-dw2.c:413: > ./md-unwind-support.h: In function 'arc_fallback_frame_state': > ./md-unwind-support.h:103:10: warning: assignment to 'struct sigcontext *' from incompatible pointer type 'mcontext_t *' [-Wincompatible-pointer-types] > 103 | sc = &rt_->uc.uc_mcontext; > | ^ > ./md-unwind-support.h:118:45: error: 'struct ' has no member named 'how' > 118 | fs->regs.reg[register_id_for_index[i]].how = REG_SAVED_OFFSET; > | ^ > /scratch/jmyers/glibc-bot/src/gcc/libgcc/shared-object.mk:14: recipe for target 'unwind-dw2.o' failed > > https://sourceware.org/pipermail/libc-testresults/2022q4/010333.html Oops, sorry. Missed one spot in the r13-3108-g146e45914032 change (my sed script didn't expect nested []s). Committed to trunk as obvious. 2022-10-07 Jakub Jelinek * config/arc/linux-unwind.h (arc_fallback_frame_state): Use fs->regs.how[X] instead of fs->regs.reg[X].how. Jakub --- libgcc/config/arc/linux-unwind.h.jj 2022-10-06 11:04:33.254058274 +0200 +++ libgcc/config/arc/linux-unwind.h 2022-10-07 00:10:24.353464043 +0200 @@ -115,7 +115,7 @@ arc_fallback_frame_state (struct _Unwind { if (register_id_for_index[i] == -1) continue; - fs->regs.reg[register_id_for_index[i]].how = REG_SAVED_OFFSET; + fs->regs.how[register_id_for_index[i]] = REG_SAVED_OFFSET; fs->regs.reg[register_id_for_index[i]].loc.offset = ((_Unwind_Ptr) &(regs[i])) - new_cfa; }