From 39cd3cce52523bc807ff001a2c1290d28ef6f24e Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 20 Jan 2022 18:27:27 -0800 Subject: [PATCH] runtime: build panic32.go on amd64p32 Fixes https://gcc.gnu.org/PR104149 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/380054 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/runtime/panic32.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 9cc6a1c..a42d88d 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 a2bf7e8..11d2a84 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 -- 2.7.4