[Guile-commits] 08/27: Add RISCV to CI and makefile

[Andy Wingo]

wingo pushed a commit to branch main
in repository guile.

commit 797fe5067c41869070b339f0a653f1af3a759335
Author: Ekaitz Zarraga <ekaitz@elenq.tech>
AuthorDate: Wed Jan 19 11:09:20 2022 +0100

    Add RISCV to CI and makefile
---
 .gitlab-ci.yml | 8 ++++++++
 tests/Makefile | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5e8694bf..449fdcd2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ before_script:
   - dpkg --add-architecture i386
   - dpkg --add-architecture arm64
   - dpkg --add-architecture armhf
+  - dpkg --add-architecture riscv64
   - apt-get update -qq
   - apt-get install -y
       libc6-dev:amd64 gcc make
@@ -11,8 +12,10 @@ before_script:
       gcc-i686-linux-gnu libc6-dev-i386-cross libc6:i386
       gcc-aarch64-linux-gnu libc6-dev-arm64-cross libc6:arm64
       gcc-arm-linux-gnueabihf libc6-dev-armhf-cross libc6:armhf
+      gcc-riscv64-linux-gnu libc6-dev-riscv64-cross libc6:riscv64
   - update-binfmts --enable qemu-aarch64
   - update-binfmts --enable qemu-arm
+  - update-binfmts --enable qemu-riscv64
 
 x86-64:
   stage: test
@@ -38,3 +41,8 @@ armhf-thumb:
   stage: test
   script:
     - make -C tests test-armv7 CC_ARMv7="arm-linux-gnueabihf-gcc -mthumb"
+
+riscv:
+  stage: test
+  script:
+    - make -C tests test-riscv CC_RISCV="riscv64-linux-gnu-gcc"
diff --git a/tests/Makefile b/tests/Makefile
index 5c44bceae..271f3e403 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -14,7 +14,8 @@ TARGETS ?= native ia32 aarch64 armv7 riscv
 #     libc6-dev:amd64 gcc make \
 #     qemu binfmt-support qemu-user-static \
 #     gcc-i686-linux-gnu libc6-dev-i386-cross libc6:i386 \
-#     gcc-aarch64-linux-gnu libc6-dev-arm64-cross libc6:arm64
+#     gcc-aarch64-linux-gnu libc6-dev-arm64-cross libc6:arm64\
+#     gcc-riscv64-linux-gnu libc6-dev-riscv64-cross libc6:riscv64
 #
 CC = gcc
 CC_IA32 ?= guix environment --pure -s i686-linux --ad-hoc gcc-toolchain -- gcc