| Message ID | 20240331084924.6075-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/1] package/dav1d: fix riscv32 build | expand |
Fabrice, All, On 2024-03-31 10:49 +0200, Fabrice Fontaine spake thusly: > Fix the following riscv32 build failure raised since bump to version > 1.4.1 in commit d8c440936d51b7f76472b43002780f5490b7a3bf and > https://github.com/videolan/dav1d/commit/43ee02a99cce1f221bdb574c9ee484180d71013f: > > /home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv32-buildroot-linux-gnu/13.2.0/../../../../riscv32-buildroot-linux-gnu/bin/ld: src/libdav1d_bitdepth_8.a.p/itx_tmpl.c.o: in function `.L0 ': > itx_tmpl.c:(.text.unlikely+0x76c): undefined reference to `dav1d_inv_txfm_add_dct_dct_4x4_8bpc_rvv' > > Fixes: d8c440936d51b7f76472b43002780f5490b7a3bf > - http://autobuild.buildroot.org/results/28192c494c7a2f88cc90205b6a08afd11782df40 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2 (after review of Bernd Kuhls): > - Fix condition > > package/dav1d/dav1d.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk > index 74c68d1660..18cb81868a 100644 > --- a/package/dav1d/dav1d.mk > +++ b/package/dav1d/dav1d.mk > @@ -24,6 +24,11 @@ ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M),y) > DAV1D_CONF_OPTS += -Denable_asm=false > endif > > +# riscv assembly requires riscv64 > +ifeq ($(BR2_riscv):$(BR2_RISCV_64),y:) > +DAV1D_CONF_OPTS += -Denable_asm=false > +endif > + > # Uses __atomic_fetch_add_4 > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > DAV1D_LDFLAGS += $(TARGET_LDFLAGS) -latomic > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 74c68d1660..18cb81868a 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -24,6 +24,11 @@ ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M),y) DAV1D_CONF_OPTS += -Denable_asm=false endif +# riscv assembly requires riscv64 +ifeq ($(BR2_riscv):$(BR2_RISCV_64),y:) +DAV1D_CONF_OPTS += -Denable_asm=false +endif + # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) DAV1D_LDFLAGS += $(TARGET_LDFLAGS) -latomic
Fix the following riscv32 build failure raised since bump to version 1.4.1 in commit d8c440936d51b7f76472b43002780f5490b7a3bf and https://github.com/videolan/dav1d/commit/43ee02a99cce1f221bdb574c9ee484180d71013f: /home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv32-buildroot-linux-gnu/13.2.0/../../../../riscv32-buildroot-linux-gnu/bin/ld: src/libdav1d_bitdepth_8.a.p/itx_tmpl.c.o: in function `.L0 ': itx_tmpl.c:(.text.unlikely+0x76c): undefined reference to `dav1d_inv_txfm_add_dct_dct_4x4_8bpc_rvv' Fixes: d8c440936d51b7f76472b43002780f5490b7a3bf - http://autobuild.buildroot.org/results/28192c494c7a2f88cc90205b6a08afd11782df40 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- Changes v1 -> v2 (after review of Bernd Kuhls): - Fix condition package/dav1d/dav1d.mk | 5 +++++ 1 file changed, 5 insertions(+)