Re: Bug#1010148: openmsx: FTBFS on riscv64

‌

Thank you for the answer,, sorry for the repost, I wasn't aware of this rule, is here a second version of the patch.

De : "Jessica Clarke"
A : olivier-gondouin@laposte.net,debian-riscv@lists.debian.org,1010148@bugs.debian.org
Envoyé: mercredi 4 Mai 2022 03:56
Objet : Re: Bug#1010148: openmsx: FTBFS on riscv64

On 4 May 2022, at 00:51, olivier-gondouin@laposte.net wrote:
>
> ‌
> 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
> 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

The Debian baseline is rv64gc and is the default, so I don’t understand
why this is here?

Jess

> 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)

commit 896ef8d363bec3f8b1af579ddbd91fa834370758 Author: Olivier Gondouin <olivier@gondouin.net> Date: Tue May 3 23:36:47 2022 +0000 patch riscv64 v2 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..9c1beac --- /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=rv64gc 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)

Reply to: