diff options
Diffstat (limited to 'meta/recipes-multimedia/x264/x264')
| -rw-r--r-- | meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch | 51 | ||||
| -rw-r--r-- | meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch | 38 |
2 files changed, 72 insertions, 17 deletions
diff --git a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch new file mode 100644 index 0000000000..cb771fb0bf --- /dev/null +++ b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch @@ -0,0 +1,51 @@ +From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Tue, 13 Dec 2016 14:22:32 -0700 +Subject: [PATCH] Fix X32 build by disabling asm + +This applies gentoo's x32 patch, adjusted slightly, which disables asm support +for x32 as well as correcting -m. + +Debian has a different patch which does the same, and there's a superior yet +out of date patch series on the x264 list which keeps asm support enabled, but +doesn't successfully build at this time, and my assembly is very rusty. + +Upstream-Status: Pending +Signed-off-by: Christopher Larson <chris_larson@mentor.com> + +--- + configure | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 51b128d..6ea9469 100755 +--- a/configure ++++ b/configure +@@ -754,7 +754,13 @@ case $host_cpu in + AS_EXT=".asm" + ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" + stack_alignment=16 +- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" ++ if [ $compiler = GNU ]; then ++ if cpp_check "" "" "__ILP32__" ; then ++ CFLAGS="-mx32 $CFLAGS" && LDFLAGS="-mx32 $LDFLAGS" ++ else ++ CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" ++ fi ++ fi + if [ "$SYS" = MACOSX ]; then + ASFLAGS="$ASFLAGS -f macho64 -DPREFIX" + if cc_check '' "-arch x86_64"; then +@@ -773,7 +779,11 @@ case $host_cpu in + RCFLAGS="--target=pe-x86-64 $RCFLAGS" + fi + else +- ASFLAGS="$ASFLAGS -f elf64" ++ if cpp_check "" "" "__ILP32__" ; then ++ asm=no ++ else ++ ASFLAGS="$ASFLAGS -f elf64" ++ fi + fi + ;; + powerpc*) diff --git a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch index bf72fca682..065e3b35b7 100644 --- a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch +++ b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch @@ -1,29 +1,33 @@ --march flag is not in CFLAGS so this will always default to -mcpu=cortex-a8 --mfpu=neon. +From a72bf499a0674fc75eedf15008b424e28f67e4bd Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei@gherzan.ro> +Date: Fri, 2 Feb 2018 15:10:08 +0200 +Subject: [PATCH] dont default to cortex-a9 with neon + +-march flag is not in CFLAGS so this will always default to + -mcpu=cortex-a8 -mfpu=neon. Upstream-Status: Pending + Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + configure | 3 --- + 1 file changed, 3 deletions(-) diff --git a/configure b/configure -index 2916036..f4ece40 100755 +index 0e3ef23..955b993 100755 --- a/configure +++ b/configure -@@ -773,9 +773,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then +@@ -911,9 +911,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then fi if [ $asm = auto -a $ARCH = ARM ] ; then - # set flags so neon is built by default -- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" +- [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" - - if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6 - cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2 - cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON -@@ -788,8 +785,6 @@ if [ $asm = auto -a $ARCH = ARM ] ; then - fi - - if [ $asm = auto -a $ARCH = AARCH64 ] ; then -- # set flags so neon is built by default -- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-arch)' || CFLAGS="$CFLAGS -arch arm64 -mfpu=neon" - - if cc_check '' '' '__asm__("cmeq v0.8h, v0.8h, #0");' ; then define HAVE_NEON - ASFLAGS="$ASFLAGS -c" + cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM + if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then + define HAVE_ARMV6 +-- +2.4.0 + |