This patch by Tobias Klauser adds libgo support for NIOS II.
Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed
to mainline.
Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 259805)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-380527c032f02446438c71b0ac0026bcab416be5
+24cd2e0542cc227200c3f91b9e0eefaa726cbc1c
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/configure.ac
===================================================================
--- libgo/configure.ac (revision 259805)
+++ libgo/configure.ac (working copy)
@@ -224,10 +224,10 @@ AC_SUBST(USE_DEJAGNU)
# - libgo/go/syscall/endian_XX.go
# - possibly others
# - possibly update files in libgo/go/internal/syscall/unix
-ALLGOARCH="386 alpha amd64 amd64p32 arm armbe arm64 arm64be ia64 m68k mips
mipsle mips64 mips64le mips64p32 mips64p32le ppc ppc64 ppc64le riscv64 s390
s390x sh shbe sparc sparc64"
+ALLGOARCH="386 alpha amd64 amd64p32 arm armbe arm64 arm64be ia64 m68k mips
mipsle mips64 mips64le mips64p32 mips64p32le nios2 ppc ppc64 ppc64le riscv64
s390 s390x sh shbe sparc sparc64"
# All known GOARCH family values.
-ALLGOARCHFAMILY="I386 ALPHA AMD64 ARM ARM64 IA64 M68K MIPS MIPS64 PPC PPC64
RISCV64 S390 S390X SH SPARC SPARC64"
+ALLGOARCHFAMILY="I386 ALPHA AMD64 ARM ARM64 IA64 M68K MIPS MIPS64 NIOS2 PPC
PPC64 RISCV64 S390 S390X SH SPARC SPARC64"
GOARCH=unknown
case ${host} in
@@ -290,6 +290,9 @@ changequote([,])dnl
;;
esac
;;
+ nios2-*-*)
+ GOARCH=nios2
+ ;;
rs6000*-*-* | powerpc*-*-*)
AC_COMPILE_IFELSE([
#ifdef _ARCH_PPC64
Index: libgo/go/cmd/cgo/main.go
===================================================================
--- libgo/go/cmd/cgo/main.go (revision 259805)
+++ libgo/go/cmd/cgo/main.go (working copy)
@@ -165,6 +165,7 @@ var ptrSizeMap = map[string]int64{
"mips64le": 8,
"mips64p32": 4,
"mips64p32le": 4,
+ "nios2": 4,
"ppc": 4,
"ppc64": 8,
"ppc64le": 8,
@@ -190,6 +191,7 @@ var intSizeMap = map[string]int64{
"mips64le": 8,
"mips64p32": 8,
"mips64p32le": 8,
+ "nios2": 4,
"ppc": 4,
"ppc64": 8,
"ppc64le": 8,
Index: libgo/go/go/build/syslist.go
===================================================================
--- libgo/go/go/build/syslist.go (revision 259805)
+++ libgo/go/go/build/syslist.go (working copy)
@@ -5,4 +5,4 @@
package build
const goosList = "aix android darwin dragonfly freebsd linux nacl netbsd
openbsd plan9 solaris windows zos "
-const goarchList = "386 amd64 amd64p32 arm armbe arm64 arm64be alpha m68k
ppc64 ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32le ppc riscv64
s390 s390x sh shbe sparc sparc64"
+const goarchList = "386 amd64 amd64p32 arm armbe arm64 arm64be alpha m68k
ppc64 ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32le nios2 ppc
riscv64 s390 s390x sh shbe sparc sparc64"
Index: libgo/go/internal/syscall/unix/getrandom_linux_generic.go
===================================================================
--- libgo/go/internal/syscall/unix/getrandom_linux_generic.go (revision
259805)
+++ libgo/go/internal/syscall/unix/getrandom_linux_generic.go (working copy)
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build arm64 riscv64
+// +build arm64 nios2 riscv64
package unix
Index: libgo/go/runtime/hash32.go
===================================================================
--- libgo/go/runtime/hash32.go (revision 259805)
+++ libgo/go/runtime/hash32.go (working copy)
@@ -6,7 +6,7 @@
// xxhash: https://code.google.com/p/xxhash/
// cityhash: https://code.google.com/p/cityhash/
-// +build 386 arm armbe m68k mips mipsle ppc s390 sh shbe sparc
+// +build 386 arm armbe m68k mips mipsle nios2 ppc s390 sh shbe sparc
package runtime
Index: libgo/go/runtime/lfstack_32bit.go
===================================================================
--- libgo/go/runtime/lfstack_32bit.go (revision 259805)
+++ libgo/go/runtime/lfstack_32bit.go (working copy)
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build 386 arm nacl armbe m68k mips mipsle mips64p32 mips64p32le ppc s390
sh shbe sparc
+// +build 386 arm nacl armbe m68k mips mipsle mips64p32 mips64p32le nios2 ppc
s390 sh shbe sparc
package runtime
Index: libgo/go/runtime/unaligned2.go
===================================================================
--- libgo/go/runtime/unaligned2.go (revision 259805)
+++ libgo/go/runtime/unaligned2.go (working copy)
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build arm mips mipsle mips64 mips64le armbe m68k sparc alpha ia64
mips64p32 mips64p32le sh shbe sparc64
+// +build alpha arm armbe ia64 m68k mips mipsle mips64 mips64le mips64p32
mips64p32le nios2 sh shbe sparc sparc64
package runtime
Index: libgo/go/syscall/endian_little.go
===================================================================
--- libgo/go/syscall/endian_little.go (revision 259805)
+++ libgo/go/syscall/endian_little.go (working copy)
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
//
-// +build 386 amd64 amd64p32 arm arm64 ppc64le mips64le mipsle alpha ia64
mips64p32le sh riscv64
+// +build 386 alpha amd64 amd64p32 arm arm64 ia64 mips64le mipsle mips64p32le
nios2 ppc64le riscv64 sh
package syscall
Index: libgo/go/syscall/libcall_linux_ustat.go
===================================================================
--- libgo/go/syscall/libcall_linux_ustat.go (revision 259805)
+++ libgo/go/syscall/libcall_linux_ustat.go (working copy)
@@ -4,7 +4,7 @@
// GNU/Linux library ustat call.
// This is not supported on some kernels, such as arm64.
-// +build !arm64,!riscv64
+// +build !arm64,!nios2,!riscv64
package syscall
Index: libgo/goarch.sh
===================================================================
--- libgo/goarch.sh (revision 259805)
+++ libgo/goarch.sh (working copy)
@@ -126,6 +126,13 @@ case $goarch in
;;
esac
;;
+ nios2)
+ family=NIOS2
+ cachelinesize=32
+ minframesize=16
+ pcquantum=4
+ ptrsize=4
+ ;;
ppc)
family=PPC
bigendian=true
Index: libgo/match.sh
===================================================================
--- libgo/match.sh (revision 259805)
+++ libgo/match.sh (working copy)
@@ -116,7 +116,7 @@ for f in $gofiles; do
aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd |
openbsd | plan9 | solaris | windows)
tag1=nonmatchingtag
;;
- 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 |
m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 |
mips64p32le | ppc | riscv64 | s390 | s390x | sh | shbe | sparc | sparc64)
+ 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 |
m68k | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | nios2 |
ppc | ppc64 | ppc64le | riscv64 | s390 | s390x | sh | shbe | sparc | sparc64)
tag1=nonmatchingtag
;;
esac
@@ -128,7 +128,7 @@ for f in $gofiles; do
aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd |
openbsd | plan9 | solaris | windows)
tag2=nonmatchingtag
;;
- 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 |
m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 |
mips64p32le | ppc | riscv64 | s390 | s390x | sh | shbe | sparc | sparc64)
+ 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 |
m68k | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | nios2 |
ppc | ppc64 | ppc64le | riscv64 | s390 | s390x | sh | shbe | sparc | sparc64)
tag2=nonmatchingtag
;;
esac
Index: libgo/testsuite/gotest
===================================================================
--- libgo/testsuite/gotest (revision 259805)
+++ libgo/testsuite/gotest (working copy)
@@ -314,7 +314,7 @@ x)
aix | android | darwin | dragonfly | freebsd | linux | nacl |
netbsd | openbsd | plan9 | solaris | windows)
tag1=nonmatchingtag
;;
- 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha |
ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 |
mips64p32le | ppc | riscv64 | s390 | s390x | sh | shbe | sparc | sparc64)
+ 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha |
ia64 | m68k | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le·|
nios2 | ppc | ppc64 | ppc64le | riscv64 | s390 | s390x | sh | shbe | sparc |
sparc64)
tag1=nonmatchingtag
;;
esac
@@ -326,7 +326,7 @@ x)
aix | android | darwin | dragonfly | freebsd | linux | nacl |
netbsd | openbsd | plan9 | solaris | windows)
tag2=nonmatchingtag
;;
- 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha |
ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 |
mips64p32le | ppc | riscv64 | s390 | s390x | sh | shbe | sparc | sparc64)
+ 386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha |
ia64 | m68k | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le·|
nios2 | ppc | ppc64 | ppc64le | riscv64 | s390 | s390x | sh | shbe | sparc |
sparc64)
tag2=nonmatchingtag
;;
esac
