jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-03 00:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

vo-aacenc: pass -marm to build non-Thumb2 compatible assembly

Browse Source 
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>
This commit is contained in:
Thomas Petazzoni 2014-04-20 23:23:32 +02:00
parent eb5e8d6ee2
commit dc4d0e2f5c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/vo-aacenc/vo-aacenc.mk
View File

@ -10,13 +10,19 @@ VO_AACENC_LICENSE = Apache-2.0
VO_AACENC_LICENSE_FILES = COPYING VO_AACENC_LICENSE_FILES = COPYING
VO_AACENC_INSTALL_STAGING = YES VO_AACENC_INSTALL_STAGING = YES
VO_AACENC_CFLAGS = $(TARGET_CFLAGS)
# arm specific asm optimizations # arm specific asm optimizations
ifeq ($(BR2_arm),y) 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) ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
VO_AACENC_CONF_OPT += --enable-armv7neon VO_AACENC_CONF_OPT += --enable-armv7neon
# mfpu=neon needed to assemble neon code # mfpu=neon needed to assemble neon code
VO_AACENC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mfpu=neon" VO_AACENC_CFLAGS += -mfpu=neon
else else
VO_AACENC_CONF_OPT += --disable-armv7neon VO_AACENC_CONF_OPT += --disable-armv7neon
@ -29,4 +35,7 @@ endif
endif # !neon endif # !neon
endif # arm endif # arm
VO_AACENC_CONF_ENV = \
CFLAGS="$(VO_AACENC_CFLAGS)"
$(eval $(autotools-package)) $(eval $(autotools-package))