From patchwork Fri Jan 21 03:07:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 50294 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 193CC3857814 for ; Fri, 21 Jan 2022 03:07:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 193CC3857814 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1642734464; bh=iWmLsUQv87eXyYFtzZnwdS80c/kj6+Xudx74Xkzff1k=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=kMInUaMzemmo6igFYwuKhLssUukOnQiF/nJaiWgRIu3a6snBJjbNXzspC0FIL8S03 d9lnION+v24O9W6HLpjkwa7c7n0j4HmOPPYZsAQYuj2R4MihgiBuUthAzgQ8gIflhd w3LfPU3g3gxQwD6yIaiiYFEgamEtD7NYpl5H4xzU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id 56F273858403 for ; Fri, 21 Jan 2022 03:07:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 56F273858403 Received: by mail-ed1-x531.google.com with SMTP id n10so21492440edv.2 for ; Thu, 20 Jan 2022 19:07:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=iWmLsUQv87eXyYFtzZnwdS80c/kj6+Xudx74Xkzff1k=; b=nJnf+dNlDWRDPICj2WwN/oztP1IS/67h6qko3DdnX7vqpYitW394ruIRTrCTqkGh2B 7Tyx5G1+3KB2c3SOoRr2vtyRNcERR/7TWRkD4kcofdn+qknCGQSDpag6a6y40gRcwOZ3 z7pllaxGgaj4L1/PYbS1joShoVRI4PzkGCkBxte40dao4j7kvdORaWBUw5hpJD3JYXf9 MihdB1Oa52KBMEfdhcnOI9luX/3rl1zbhS4E0j7qAZWuoOmDmInHCmkO+hcq36jft7cH ZVEaorSU4+xSerFMOStFtDzhMacSYOUM3+i77c6nA7ppY6LCucrLElgH9jdEfhWIaKY6 VduA== X-Gm-Message-State: AOAM531r4upfsEJeZrsCs8hvBuoCSgq0sSeAG5VR0w+HylhzEGR4IH+T NiH626cS+n30ojn5Ev/k2ozfYCFQdwqrawR5m+CGvXax4I0jGg== X-Google-Smtp-Source: ABdhPJw0ZCkFiIii3tJkMubSIk47ePFP9pFzqtVSbVFDUoeCd2XV8morvWh3i4wy3Mno465ctn1bKlp2Sls5ZCDPiNQ= X-Received: by 2002:a17:906:3acc:: with SMTP id z12mr1701698ejd.10.1642734433093; Thu, 20 Jan 2022 19:07:13 -0800 (PST) MIME-Version: 1.0 Date: Thu, 20 Jan 2022 19:07:02 -0800 Message-ID: Subject: libgo patch committed: Build panic32.go on amd64p32 To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: 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: Ian Lance Taylor via Gcc-patches From: Ian Lance Taylor Reply-To: Ian Lance Taylor Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This libgo patch builds panic32.go on amd64p32 (that is, x86 x32 mode). This fixes GCC PR 104149. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu, and H.J. tested the patch on x32 (thanks!). Committed to mainline. Ian 4f614712c908ca00fdb83057420e0023c9171477 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 9cc6a1c63c6..a42d88d25c4 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -799e9807c36fc661b14dfff136369556f09a5ebf +7d510bf5fcec9b0ccc0282f4193a80c0a164df63 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/runtime/panic32.go b/libgo/go/runtime/panic32.go index a2bf7e8fa2a..11d2a8450d9 100644 --- a/libgo/go/runtime/panic32.go +++ b/libgo/go/runtime/panic32.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build 386 || arm || mips || mipsle || armbe || m68k || nios2 || ppc || riscv || s390 || sh || shbe || sparc -// +build 386 arm mips mipsle armbe m68k nios2 ppc riscv s390 sh shbe sparc +//go:build 386 || amd64p32 || arm || mips || mipsle || armbe || m68k || nios2 || ppc || riscv || s390 || sh || shbe || sparc +// +build 386 amd64p32 arm mips mipsle armbe m68k nios2 ppc riscv s390 sh shbe sparc package runtime