diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-20 23:23:32 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-20 23:23:32 +0200 |
| commit | dc4d0e2f5cc783a826b3bfe4d31c00840407a8e2 (patch) | |
| tree | 80f92f627622412495802b727b3f10ff57aa1c19 /package/vo-aacenc | |
| parent | eb5e8d6ee2ec67b0bc013481aff7c1940dbd4b30 (diff) | |
vo-aacenc: pass -marm to build non-Thumb2 compatible assembly
vo-aacenc has some hand-written assembly that cannot build in Thumb2,
so we have to explicitly pass -marm to make sure this particular
package is always built with full-length ARM instructions.
Fixes:
http://autobuild.buildroot.org/results/680/680b29cd824624eb8e4ec71187b9a6576444e72b/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/vo-aacenc')
| -rw-r--r-- | package/vo-aacenc/vo-aacenc.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/package/vo-aacenc/vo-aacenc.mk b/package/vo-aacenc/vo-aacenc.mk index 8f01c34b7..503876fc2 100644 --- a/package/vo-aacenc/vo-aacenc.mk +++ b/package/vo-aacenc/vo-aacenc.mk @@ -10,13 +10,19 @@ VO_AACENC_LICENSE = Apache-2.0 VO_AACENC_LICENSE_FILES = COPYING VO_AACENC_INSTALL_STAGING = YES +VO_AACENC_CFLAGS = $(TARGET_CFLAGS) + # arm specific asm optimizations ifeq ($(BR2_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 + ifeq ($(BR2_ARM_CPU_HAS_NEON),y) VO_AACENC_CONF_OPT += --enable-armv7neon # mfpu=neon needed to assemble neon code -VO_AACENC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mfpu=neon" +VO_AACENC_CFLAGS += -mfpu=neon else VO_AACENC_CONF_OPT += --disable-armv7neon @@ -29,4 +35,7 @@ endif endif # !neon endif # arm +VO_AACENC_CONF_ENV = \ + CFLAGS="$(VO_AACENC_CFLAGS)" + $(eval $(autotools-package)) |