Skip to contentSkip to conversation

vo-aacenc: disable arm optimizations on thumb2-only variants

PATCH New Peter Korsgaard 1 participant 2 messages Oct 2, 2016

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/1 vo-aacenc: disable arm optimizations on thumb2-only variants

Fixes:
http://autobuild.buildroot.org/results/258/258e14227cdd5a6f5cc83ab7fd176eb5b5b8445a/
http://autobuild.buildroot.org/results/634/6345b4c491fca952cd692844e3ac2932ac4836dc/

The ARM assembly optimizations in vo-aacenc requires ARM instructions support, so disable for ARM variants without ARM instruction support (E.G. cortex-m).

Signed-off-by Peter Korsgaard <[email protected]>
---
 package/vo-aacenc/vo-aacenc.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/vo-aacenc/vo-aacenc.mk +5 -0
index 23d7e62..ecdd584 100644
@@ -15,6 +15,7 @@ VO_AACENC_CFLAGS = $(TARGET_CFLAGS)
 # arm specific asm optimizations
 ifeq ($(BR2_arm),y)
 
+ifeq ($(BR2_ARM_CPU_HAS_ARM),y)
 # vo-aacenc has ARM assembly code that cannot be compiled in Thumb2
 # mode, so we must force the traditional ARM mode.
 VO_AACENC_CFLAGS += -marm

@@ -33,6 +34,10 @@ VO_AACENC_CONF_OPTS += --disable-armv5e
 endif
 
 endif # !neon
+
+else
+VO_AACENC_CONF_OPTS += --disable-armv7neon --disable-armv5e
+endif # has-arm
 endif # arm
 
 VO_AACENC_CONF_ENV = \
Signature · 1 line
2.9.3
author
#1 lore raw

PATCH 1/1 vo-aacenc: disable arm optimizations on thumb2-only variants

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Fixes:
http://autobuild.buildroot.org/results/258/258e14227cdd5a6f5cc83ab7fd176eb5b5b8445a/
http://autobuild.buildroot.org/results/634/6345b4c491fca952cd692844e3ac2932ac4836dc/

The ARM assembly optimizations in vo-aacenc requires ARM instructions support, so disable for ARM variants without ARM instruction support (E.G. cortex-m).

Signed-off-by Peter Korsgaard <[email protected]>

Committed, thanks.

Signature · 2 lines
Venlig hilsen,
Peter Korsgaard