Merge pull request #168 from sio/riscv

Use upstream compiler for linux/riscv64 and freebsd/riscv64
creack · Oct 26, 2023 · 5c92749 · 5c92749
2 parents 04081dc + 7f13640
commit 5c92749
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 30 deletions.
diff --git a/Dockerfile.riscv b/Dockerfile.riscv
diff --git a/test_crosscompile.sh b/test_crosscompile.sh
@@ -25,9 +25,9 @@ cross() {
 
 set -e
 
-cross linux     amd64 386 arm arm64 ppc64 ppc64le s390x mips mipsle mips64 mips64le
+cross linux     amd64 386 arm arm64 ppc64 ppc64le s390x mips mipsle mips64 mips64le riscv64
 cross darwin    amd64 arm64
-cross freebsd   amd64 386 arm arm64
+cross freebsd   amd64 386 arm arm64 riscv64
 cross netbsd    amd64 386 arm arm64
 cross openbsd   amd64 386 arm arm64
 cross dragonfly amd64
@@ -45,10 +45,6 @@ if ! hash docker; then
   return
 fi
 
-echo2 "Build for linux."
-echo2 "  - linux/riscv"
-docker build -t creack-pty-test -f Dockerfile.riscv .
-
 # Golang dropped support for darwin 32bits since go1.15. Make sure the lib still compile with go1.14 on those archs.
 echo2 "Build for darwin (32bits)."
 echo2 "  - darwin/386"
@@ -57,7 +53,6 @@ echo2 "  - darwin/arm"
 docker build -t creack-pty-test -f Dockerfile.golang --build-arg=GOVERSION=1.14 --build-arg=GOOS=darwin --build-arg=GOARCH=arm .
 
 # Run a single test for an old go version. Would be best with go1.0, but not available on Dockerhub.
-# Using 1.6 as it is the base version for the RISCV compiler.
 # Would also be better to run all the tests, not just one, need to refactor this file to allow for specifc archs per version.
 echo2 "Build for linux - go1.6."
 echo2 "  - linux/amd64"

diff --git a/ztypes_freebsd_riscv64.go b/ztypes_freebsd_riscv64.go