Re: Bug#1010148: openmsx: FTBFS on riscv64

[olivier-gondouin@laposte.net]

‌

Hi,

Sorry if I don't answer the good way, I'm new in patch contribution of Debian.

‌Here is a patch for OpenMSX 17.0 on RISCV64, not specific to Debian. in the hope it can help you.

Regards.

commit 3846683656aef48a4faa26e8213163fb21cecd34
Author: Olivier Gondouin <olivier@gondouin.net>
Date:   Tue May 3 23:36:47 2022 +0000

    patch riscv64

diff --git a/build/detectsys.py b/build/detectsys.py
index 060e4a8..27ee135 100644
--- a/build/detectsys.py
+++ b/build/detectsys.py
@@ -35,6 +35,8 @@ def detectCPU():
 		return 'aarch64'
 	elif cpu == 'aarch64_be':
 		return 'aarch64_be'
+	elif cpu == 'riscv64':
+		return 'riscv64'
 	elif cpu.startswith('mips') or cpu == 'sgi':
 		return 'mipsel' if cpu.endswith('el') else 'mips'
 	elif cpu == 'm68k':
diff --git a/build/flavour-riscv64.mk b/build/flavour-riscv64.mk
new file mode 100644
index 0000000..ec4c293
--- /dev/null
+++ b/build/flavour-riscv64.mk
@@ -0,0 +1,7 @@
+# Configuration for "riscv64" flavour:
+
+# Start with generic optimisation flags.
+include build/flavour-opt.mk
+
+# Add riscv64 specific flags.
+CXXFLAGS+=-march=rv64g
diff --git a/build/main.mk b/build/main.mk
index 2e93733..48cdfb7 100644
--- a/build/main.mk
+++ b/build/main.mk
@@ -159,10 +159,14 @@ else
 ifeq ($(OPENMSX_TARGET_CPU),m68k)
 OPENMSX_FLAVOUR?=m68k
 else
+ifeq ($(OPENMSX_TARGET_CPU),riscv64)
+OPENMSX_FLAVOUR?=riscv64
+else
 OPENMSX_FLAVOUR?=opt
 endif
 endif
 endif
+endif
 
 # Load OS specific settings.
 $(call DEFCHECK,OPENMSX_TARGET_OS)