From d24c41ef1a44b72aaf03edc6eb40cae711b27f95 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 31 Aug 2019 02:55:09 +0000 Subject: [PATCH] runtime: always build panic32.go Avoids problems with arm64 ILP32 mode. We might want to handle that mode better in general, but always building panic32.go is simple and fixes the build. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/192723 From-SVN: r275237 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/runtime/panic32.go | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index e2459733b3d..c8605ec685d 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -11fd9208f8545e882f945d3ed86fcc33abf1a61b +2444eb1e8c697531f8beb403679e4ab00b16dbf5 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 f68d4c71b0b..c8861c9c11c 100644 --- a/libgo/go/runtime/panic32.go +++ b/libgo/go/runtime/panic32.go @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build 386 amd64p32 arm mips mipsle m68k nios2 sh shbe - package runtime import _ "unsafe" // for go:linkname -- 2.30.2