diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-06-08 22:28:25 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-11 23:59:16 +0100 |
commit | 8c9acb766b3ab92224f9b1598eb0196ef6d92974 (patch) | |
tree | 8c74bff9e0ca7691042814298e846c06dc45591f /meta/recipes-multimedia/x264/x264 | |
parent | e28c11150019523849e1c75e089779f61cefa6ce (diff) | |
download | poky-8c9acb766b3ab92224f9b1598eb0196ef6d92974.tar.gz |
x264: r2265 -> r2491
Update don-t-default-to-cortex-a9-with-neon.patch for aarch64.
(From OE-Core rev: 2c8d6320ca4db7f7158a3e69467bee5c8ca8fed5)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/x264/x264')
-rw-r--r-- | meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch | 21 |
1 files changed, 15 insertions, 6 deletions
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 b844d88fe8..bf72fca682 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 | |||
@@ -4,13 +4,13 @@ | |||
4 | Upstream-Status: Pending | 4 | Upstream-Status: Pending |
5 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | 5 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> |
6 | 6 | ||
7 | Index: git/configure | 7 | diff --git a/configure b/configure |
8 | =================================================================== | 8 | index 2916036..f4ece40 100755 |
9 | --- git.orig/configure 2013-02-10 16:26:40.666343682 +0200 | 9 | --- a/configure |
10 | +++ git/configure 2013-02-10 16:27:49.198341677 +0200 | 10 | +++ b/configure |
11 | @@ -703,9 +703,6 @@ | 11 | @@ -773,9 +773,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then |
12 | fi | 12 | fi |
13 | 13 | ||
14 | if [ $asm = auto -a $ARCH = ARM ] ; then | 14 | if [ $asm = auto -a $ARCH = ARM ] ; then |
15 | - # set flags so neon is built by default | 15 | - # set flags so neon is built by default |
16 | - echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" | 16 | - echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" |
@@ -18,3 +18,12 @@ Index: git/configure | |||
18 | if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6 | 18 | if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6 |
19 | cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2 | 19 | cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2 |
20 | cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON | 20 | cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON |
21 | @@ -788,8 +785,6 @@ if [ $asm = auto -a $ARCH = ARM ] ; then | ||
22 | fi | ||
23 | |||
24 | if [ $asm = auto -a $ARCH = AARCH64 ] ; then | ||
25 | - # set flags so neon is built by default | ||
26 | - echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-arch)' || CFLAGS="$CFLAGS -arch arm64 -mfpu=neon" | ||
27 | |||
28 | if cc_check '' '' '__asm__("cmeq v0.8h, v0.8h, #0");' ; then define HAVE_NEON | ||
29 | ASFLAGS="$ASFLAGS -c" | ||