Skip to contentSkip to conversation

package/dav1d: disable asm on i386

PATCH New Bernd Kuhls 2 participants 3 messages Sep 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/dav1d: disable asm on i386

Fixes:
http://autobuild.buildroot.net/results/19e/19ee2bdd4c8d14cc1554092594b3721117ca1005/
http://autobuild.buildroot.net/results/72e/72e4089dafacd245e781214b72baeb81a1e3d3d7/

---
 package/dav1d/dav1d.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/dav1d/dav1d.mk +3 -3
index 1e84c21b47..62f673b991 100644
@@ -14,12 +14,12 @@ DAV1D_CONF_OPTS = \
 	-Denable_tests=false \
 	-Denable_tools=false
 
-ifeq ($(BR2_i386)$(BR2_x86_64),y)
+ifeq ($(BR2_x86_64),y)
 DAV1D_DEPENDENCIES += host-nasm
 endif
 
-# ARM assembly requires v6+ ISA
-ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M),y)
+# ARM assembly requires v6+ ISA, asm is broken in i386
+ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M)$(BR2_i386),y)
 DAV1D_CONF_OPTS += -Denable_asm=false
 endif
 
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 package/dav1d: disable asm on i386

Hello Bernd,

Quoted 16 lines · On Sun, 20 Sep 2020 10:09:30 +0200 Bernd Kuhls <[email protected]> wrote:

Fixes:
http://autobuild.buildroot.net/results/19e/19ee2bdd4c8d14cc1554092594b3721117ca1005/
http://autobuild.buildroot.net/results/72e/72e4089dafacd245e781214b72baeb81a1e3d3d7/

---
 package/dav1d/dav1d.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/dav1d/dav1d.mk +0 -0
index 1e84c21b47..62f673b991 100644
@@ -14,12 +14,12 @@ DAV1D_CONF_OPTS = \
 	-Denable_tests=false \
 	-Denable_tools=false

package/dav1d/dav1d.mk DAV1D_CONF_OPTS = \ · line 22

Quoted 10 lines
package/dav1d/dav1d.mk +3 -3
 
-ifeq ($(BR2_i386)$(BR2_x86_64),y)
+ifeq ($(BR2_x86_64),y)
 DAV1D_DEPENDENCIES += host-nasm
 endif
 
-# ARM assembly requires v6+ ISA
-ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M),y)
+# ARM assembly requires v6+ ISA, asm is broken in i386
+ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M)$(BR2_i386),y)

Are you sure this is the right fix ? Indeed, when I look at:

http://autobuild.buildroot.net/?reason=dav1d%

This issue started to appear with dav1d 0.7.1 on August 27, 2020.

However dav1d was bumped to 0.7.1 in June 2020, so it cannot be that. But the nasm compiler was bumped on August 25, 2020, in commit 090a748aae1b9495362000ca6bf953ef8bc8154e. So it rather seems like a change in nasm broke i386 assembly in dav1d.

And apparently, the x86 build has been fixed upstream, as there is an issue in the upstream bug tracker asking for a new release with this fix:

https://code.videolan.org/videolan/dav1d/-/issues/347

Could you check if the latest dav1d master fixes this ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/dav1d: disable asm on i386

Am Sun, 20 Sep 2020 15:31:18 +0200 schrieb Thomas Petazzoni:

Quoted 4 lines

However dav1d was bumped to 0.7.1 in June 2020, so it cannot be that. But the nasm compiler was bumped on August 25, 2020, in commit 090a748aae1b9495362000ca6bf953ef8bc8154e. So it rather seems like a change in nasm broke i386 assembly in dav1d.

Hi Thomas,

I tested
https://code.videolan.org/videolan/dav1d/-/commit/
464ca6c2f37b93180cc27ea41889ffaf1eab388e

and various other patches committed to dav1d after the last version bump and all of them did not fix the autobuilder error.

But pointing to nasm now did the trick nonetheless:
https://nasm.us/doc/nasmdocc.html
"Correct %ifid $ and %ifid $$ being treated as true."

Bumping nasm fixes the dav1d build error, sent patch:
http://patchwork.ozlabs.org/project/buildroot/patch/
20200920165758.2032916-1-bernd.kuhls at t-online.de/

Regards, Bernd