]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
make.sh: riscv64: Emulate SiFive U54 CPU
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 22 Feb 2022 12:51:27 +0000 (12:51 +0000)
committerPeter Müller <peter.mueller@ipfire.org>
Tue, 22 Feb 2022 19:41:39 +0000 (19:41 +0000)
In QEMU, some processes seem to freeze/deadlock in their futex handling
which is causing the whole build process to block.

Changing the emulated CPU seems to work around these problems.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
make.sh

diff --git a/make.sh b/make.sh
index 522fe84011ac39addb231da5d9ffe45966613eca..1fb14c9eaa78343a8e66dac74d2edfd4000dc773 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -793,6 +793,11 @@ qemu_environ() {
                arm*)
                        QEMU_CPU="${QEMU_CPU:-cortex-a9}"
 
+                       env="${env} QEMU_CPU=${QEMU_CPU}"
+                       ;;
+               riscv64)
+                       QEMU_CPU="${QEMU_CPU:-sifive-u54}"
+
                        env="${env} QEMU_CPU=${QEMU_CPU}"
                        ;;
        esac