summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2019-08-12 07:34:17 +0000
committerKhem Raj <raj.khem@gmail.com>2019-08-12 09:11:01 -0700
commitd3579d05db727d8ab112e7583c094e922b21a593 (patch)
tree8313e9d1497ccdbf7a3a4f90325b8fa6aadc23ba /meta-oe
parent10acf95d98e9d08e96a0bc5168c45b5c574294c6 (diff)
downloadmeta-openembedded-d3579d05db727d8ab112e7583c094e922b21a593.tar.gz
redis: backport a fix for stack trace generation on aarch64
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch45
-rw-r--r--meta-oe/recipes-extended/redis/redis_4.0.14.bb1
2 files changed, 46 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch b/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch
new file mode 100644
index 000000000..82ca30739
--- /dev/null
+++ b/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch
@@ -0,0 +1,45 @@
1From c8ca71d40bc51e255457cd4374dd45ec9ebf8ae1 Mon Sep 17 00:00:00 2001
2From: Jun He <jun.he@arm.com>
3Date: Mon, 3 Jul 2017 07:18:32 +0000
4Subject: [PATCH] Fixed stack trace generation on aarch64
5
6Change-Id: I9801239c98cb7362ed07e8b9ec2ba7e45749dba7
7Signed-off-by: Jun He <jun.he@arm.com>
8
9* fixes also this error when building with -Werror=return-type:
10 debug.c:698:1: error: no return statement in function returning non-void [-Werror=return-type]
11
12Upstream-Status: Backport [https://github.com/antirez/redis/commit/c8ca71d40bc51e255457cd4374dd45ec9ebf8ae1]
13
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 src/Makefile | 2 +-
17 src/debug.c | 2 ++
18 2 files changed, 3 insertions(+), 1 deletion(-)
19
20diff --git a/src/Makefile b/src/Makefile
21index 24e960593eb..a1ff4258a9d 100644
22--- a/src/Makefile
23+++ b/src/Makefile
24@@ -40,7 +40,7 @@
25 endif
26
27 # To get ARM stack traces if Redis crashes we need a special C flag.
28-ifneq (,$(findstring armv,$(uname_M)))
29+ifneq (,$(filter aarch64 armv,$(uname_M)))
30 CFLAGS+=-funwind-tables
31 endif
32
33diff --git a/src/debug.c b/src/debug.c
34index a4caa49f285..c976d0ed919 100644
35--- a/src/debug.c
36+++ b/src/debug.c
37@@ -691,6 +691,8 @@
38 return (void*) uc->uc_mcontext.sc_ip;
39 #elif defined(__arm__) /* Linux ARM */
40 return (void*) uc->uc_mcontext.arm_pc;
41+ #elif defined(__aarch64__) /* Linux AArch64 */
42+ return (void*) uc->uc_mcontext.pc;
43 #endif
44 #else
45 return NULL;
diff --git a/meta-oe/recipes-extended/redis/redis_4.0.14.bb b/meta-oe/recipes-extended/redis/redis_4.0.14.bb
index 63ab44b6a..5df5312a0 100644
--- a/meta-oe/recipes-extended/redis/redis_4.0.14.bb
+++ b/meta-oe/recipes-extended/redis/redis_4.0.14.bb
@@ -10,6 +10,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
10 file://hiredis-use-default-CC-if-it-is-set.patch \ 10 file://hiredis-use-default-CC-if-it-is-set.patch \
11 file://lua-update-Makefile-to-use-environment-build-setting.patch \ 11 file://lua-update-Makefile-to-use-environment-build-setting.patch \
12 file://oe-use-libc-malloc.patch \ 12 file://oe-use-libc-malloc.patch \
13 file://Fixed-stack-trace-generation-on-aarch64.patch \
13 file://redis.conf \ 14 file://redis.conf \
14 file://init-redis-server \ 15 file://init-redis-server \
15 file://redis.service \ 16 file://redis.service \