Skip to contentSkip to conversation

x264: use assembly files on ARMv7

PATCH New David du Colombier 2 participants 2 messages Oct 9, 2014 – Oct 11, 2014

lore
Share & tools
lore

David du Colombier

author
#0 lore raw

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

Signed-off-by David du Colombier <[email protected]>
---
 package/x264/x264.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
package/x264/x264.mk +5 -3
index 35d9fef..e5fa856 100644
@@ -14,7 +14,7 @@ X264_INSTALL_STAGING = YES
 
 ifeq ($(BR2_i386)$(BR2_x86_64),y)
 X264_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 v3 1/1 x264: use assembly files on ARMv7

Quoted 21 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"David" == David du Colombier <[email protected]> writes:

Signed-off-by David du Colombier <[email protected]>
---
 package/x264/x264.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
package/x264/x264.mk +1 -1
index 35d9fef..e5fa856 100644
@@ -14,7 +14,7 @@ X264_INSTALL_STAGING = YES
 
 ifeq ($(BR2_i386)$(BR2_x86_64),y)
 X264_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

package/x264/x264.mk ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) · line 37

Quoted 10 lines
package/x264/x264.mk +4 -2
@@ -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 \

As this is only for ARM, I prefer to move it to the ifeq above (and make the check use positive logic).

Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard