CVS commit: pkgsrc/devel/go-sys

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri May  1 20:57:44 UTC 2020

Modified Files:
        pkgsrc/devel/go-sys: Makefile distinfo
Added Files:
        pkgsrc/devel/go-sys/patches: patch-cpu_cpu__arm64.go

Log Message:
go-sys: Fix SIGILL on netbsd/arm64


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/go-sys/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/go-sys/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/go-sys/patches/patch-cpu_cpu__arm64.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/go-sys/Makefile
diff -u pkgsrc/devel/go-sys/Makefile:1.27 pkgsrc/devel/go-sys/Makefile:1.28
--- pkgsrc/devel/go-sys/Makefile:1.27   Sun Apr 12 11:01:34 2020
+++ pkgsrc/devel/go-sys/Makefile        Fri May  1 20:57:43 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2020/04/12 11:01:34 bsiegert Exp $
+# $NetBSD: Makefile,v 1.28 2020/05/01 20:57:43 tnn Exp $
 #
 
 DISTNAME=              go-sys-0.0.20200202
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=golang/}
 GITHUB_PROJECT=                sys
@@ -23,6 +23,9 @@ REPLACE_BASH+=                plan9/*.sh unix/*.sh win
 pre-patch:
        ${RM} -rf ${WRKSRC}/windows/mkwinsyscall
 
+pre-build:
+       ${RM} -f ${WRKSRC}/*/*.go.orig
+
 .include "../../lang/go/go-package.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/go-sys/distinfo
diff -u pkgsrc/devel/go-sys/distinfo:1.4 pkgsrc/devel/go-sys/distinfo:1.5
--- pkgsrc/devel/go-sys/distinfo:1.4    Mon Feb  3 15:00:29 2020
+++ pkgsrc/devel/go-sys/distinfo        Fri May  1 20:57:43 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2020/02/03 15:00:29 bsiegert Exp $
+$NetBSD: distinfo,v 1.5 2020/05/01 20:57:43 tnn Exp $
 
 SHA1 (go-sys-0.0.20200202-d101bd2416.tar.gz) = d428638aaf94785499f3a8960088bfe30591db5d
 RMD160 (go-sys-0.0.20200202-d101bd2416.tar.gz) = b7b953b649c43d44d4eeb15b6598954ce2c06b73
 SHA512 (go-sys-0.0.20200202-d101bd2416.tar.gz) = 0d9b69c7c7b0d525d359d70e75a243ee109fd1bcadd535a6c7704b7bdbeb1bd0f3140c09fcbd9c22ff777b7a54a4c9dfb4036dc837ad703fcbbb2cda1858326a
 Size (go-sys-0.0.20200202-d101bd2416.tar.gz) = 1539300 bytes
+SHA1 (patch-cpu_cpu__arm64.go) = f04d8caad468f097e25d05e64eb681463ab6daa5

Added files:

Index: pkgsrc/devel/go-sys/patches/patch-cpu_cpu__arm64.go
diff -u /dev/null pkgsrc/devel/go-sys/patches/patch-cpu_cpu__arm64.go:1.1
--- /dev/null   Fri May  1 20:57:44 2020
+++ pkgsrc/devel/go-sys/patches/patch-cpu_cpu__arm64.go Fri May  1 20:57:44 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-cpu_cpu__arm64.go,v 1.1 2020/05/01 20:57:44 tnn Exp $
+
+Fix SIGILL on netbsd/arm64
+
+--- cpu/cpu_arm64.go.orig      2020-02-02 16:47:22.000000000 +0000
++++ cpu/cpu_arm64.go
+@@ -10,8 +10,13 @@ const cacheLineSize = 64
+ 
+ func init() {
+       switch runtime.GOOS {
+-      case "android", "darwin":
++      case "android", "darwin", "netbsd":
+               // Android and iOS don't seem to allow reading these registers.
++              // NetBSD:
++              // ID_AA64ISAR0_EL1 is a privileged register and cannot be read from EL0.
++              // It can be read via sysctl(3). Example for future implementers:
++              // https://nxr.netbsd.org/xref/src/usr.sbin/cpuctl/arch/aarch64.c
++              //
+               // Fake the minimal features expected by
+               // TestARM64minimalFeatures.
+               ARM64.HasASIMD = true