Skip to contentSkip to conversation

x264: use assembly files on ARMv7

PATCH Superseded David du Colombier 2 participants 3 messages Oct 9, 2014

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 x264: use assembly files on ARMv7

---
 package/x264/x264.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
package/x264/x264.mk +5 -3
index c2397f8..713e37e 100644
@@ -14,7 +14,7 @@ X264_INSTALL_STAGING = YES
 
 ifeq ($(BR2_i386)$(BR2_x86_64),y)
 	FFMPEG_DEPENDENCIES += host-yasm
-else
+else ifeq ($(BR2_cortex_a5)$(BR2_cortex_a7)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a12)$(BR2_cortex_a15),)
 	X264_CONF_OPTS += --disable-asm
 endif
 
@@ -30,9 +30,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
 	X264_CONF_OPTS += --disable-thread
 endif
 
-# the configure script is not generated by autoconf
+# The configure script is not generated by autoconf.
+# We need to pass gcc as AS, because the ARM assembly
+# files have to be preprocessed.
 define X264_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure \
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) AS="$(TARGET_CC)" ./configure \
 		--prefix=/usr \
 		--host="$(GNU_TARGET_NAME)" \
 		--cross-prefix="$(TARGET_CROSS)" \
Signature · 1 line
1.9.3
#1 lore raw

PATCH v2 1/1 x264: use assembly files on ARMv7

Dear David du Colombier,

Quoted 4 lines · David du Colombier
---
 package/x264/x264.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

You should refresh the patch against the latest git, as other changes to the package have been merged in the mean time.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH v2 1/1 x264: use assembly files on ARMv7

Quoted 2 lines

You should refresh the patch against the latest git, as other changes to the package have been merged in the mean time.

Oh yes, I've just noticed that. Thanks for the fixes.

Signature · 1 line
David du Colombier