1 From 6b2250a1a39362abe53e78a45897caecf65ec73f Mon Sep 17 00:00:00 2001
2 From: Filippo Arcidiacono <filippo.arcidiacono@st.com>
3 Date: Thu, 9 May 2013 11:42:23 +0200
4 Subject: [PATCH] libubacktrace: fix backtrace for statically linked
7 libgcc_s.so's unwinder could not access unwind tables of statically
8 linked binaries, so we really want to use _Unwind_* stuff from
10 It required to build backtrace.c differentiating between shared and
13 Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
14 Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
15 (cherry picked from commit 71c10c484e7dc113396cccb7e503befb759c6346)
17 Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
19 libubacktrace/Makefile.in | 23 ++++++++++++++---------
20 libubacktrace/arm/Makefile.arch | 2 +-
21 libubacktrace/arm/backtrace.c | 7 +++++++
22 libubacktrace/backtrace.c | 7 +++++++
23 4 files changed, 29 insertions(+), 10 deletions(-)
25 diff --git a/libubacktrace/Makefile.in b/libubacktrace/Makefile.in
26 index 8a4b081..612bf2d 100644
27 --- a/libubacktrace/Makefile.in
28 +++ b/libubacktrace/Makefile.in
29 @@ -25,11 +25,13 @@ libubacktrace_ARCH_OUT:=$(libubacktrace_OUT)/$(TARGET_ARCH)
30 -include $(libubacktrace_ARCH_DIR)/Makefile.arch
32 libubacktrace_SRC-y :=
33 -libubacktrace_SRC-$(UCLIBC_HAS_BACKTRACE) := backtrace.c backtracesyms.c backtracesymsfd.c
34 +libubacktrace_SRC-$(UCLIBC_HAS_BACKTRACE) := backtracesyms.c backtracesymsfd.c
35 +libubacktrace_SRC_SHARED-$(UCLIBC_HAS_BACKTRACE) := backtrace.c
37 # remove generic sources, if arch specific version is present
38 ifneq ($(strip $(libubacktrace_ARCH_SRC-y)),)
39 libubacktrace_SRC-y := $(filter-out $(notdir $(libubacktrace_ARCH_SRC-y)),$(libubacktrace_SRC-y))
40 +libubacktrace_SRC_SHARED-y := $(filter-out $(notdir $(libubacktrace_ARCH_SRC-y)),$(libubacktrace_SRC_SHARED-y))
43 # -fasynchronous-unwind-tables is required for backtrace to work using dwarf2
44 @@ -43,12 +45,19 @@ endif
45 libubacktrace_SRCS := $(patsubst %.c,$(libubacktrace_DIR)/%.c,$(libubacktrace_SRC-y))
46 libubacktrace_OBJS := $(patsubst $(libubacktrace_DIR)/%.c,$(libubacktrace_OUT)/%.o,$(libubacktrace_SRCS))
48 +libubacktrace_SHARED_SRCS := $(patsubst %.c,$(libubacktrace_DIR)/%.c,$(libubacktrace_SHARED_SRC-y))
49 +libubacktrace_SHARED_OBJS := $(patsubst $(libubacktrace_DIR)/%.c,$(libubacktrace_OUT)/%.s,$(libubacktrace_SHARED_SRCS))
51 +libubacktrace-shared-y := $(libubacktrace_SHARED_OBJS:.os=.oS)
52 +libubacktrace-static-y := $(libubacktrace_SHARED_OBJS)
55 -libubacktrace-a-y += $(libubacktrace_OBJS:.o=.os)
56 +libubacktrace-a-y += $(libubacktrace_OBJS:.o=.os) $(libubacktrace-static-y:.o=.os)
58 -libubacktrace-a-y += $(libubacktrace_OBJS)
59 +libubacktrace-a-y += $(libubacktrace_OBJS) $(libubacktrace-static-y)
61 -libubacktrace-so-y += $(libubacktrace_OBJS:.o=.os)
62 +libubacktrace-so-y += $(libubacktrace_OBJS:.o=.os) $(libubacktrace-shared-y)
65 lib-a-$(UCLIBC_HAS_BACKTRACE) += $(top_builddir)lib/libubacktrace.a
66 lib-so-$(UCLIBC_HAS_BACKTRACE) += $(top_builddir)lib/libubacktrace.so
67 @@ -56,11 +65,7 @@ lib-so-$(UCLIBC_HAS_BACKTRACE) += $(top_builddir)lib/libubacktrace.so
68 objclean-y += CLEAN_libubacktrace
72 -$(top_builddir)lib/libubacktrace.so: $(top_builddir)lib/libubacktrace.a $(libdl.depend)
74 $(top_builddir)lib/libubacktrace.so: $(libubacktrace_OUT)/libubacktrace_so.a $(libdl.depend)
76 $(call link.so,$(libubacktrace_FULL_NAME),$(ABI_VERSION))
78 $(top_builddir)lib/libubacktrace.so: $(libubacktrace_OUT)/libubacktrace.oS | $(libdl.depend)
79 @@ -71,7 +76,7 @@ $(libubacktrace_OUT)/libubacktrace_so.a: $(libubacktrace-so-y)
83 -$(libubacktrace_OUT)/libubacktrace.oS: $(libubacktrace_SRCS) $(libubacktrace_ARCH_SRCS)
84 +$(libubacktrace_OUT)/libubacktrace.oS: $(libubacktrace_SRCS) $(libubacktrace_ARCH_SRCS) $(libubacktrace_SHARED_SRCS)
88 diff --git a/libubacktrace/arm/Makefile.arch b/libubacktrace/arm/Makefile.arch
89 index 53b8c0e..b3fb500 100644
90 --- a/libubacktrace/arm/Makefile.arch
91 +++ b/libubacktrace/arm/Makefile.arch
92 @@ -14,4 +14,4 @@ libubacktrace-a-y+=$(libubacktrace_ARCH_OBJS:.o=.os)
94 libubacktrace-a-y+=$(libubacktrace_ARCH_OBJS)
96 -libubacktrace-so-y+=$(libubacktrace_ARCH_OBJS:.o=.os)
97 +libubacktrace-so-y+=$(libubacktrace_ARCH_OBJS:.o=.oS)
98 diff --git a/libubacktrace/arm/backtrace.c b/libubacktrace/arm/backtrace.c
99 index d4eca32..5955189 100644
100 --- a/libubacktrace/arm/backtrace.c
101 +++ b/libubacktrace/arm/backtrace.c
102 @@ -25,6 +25,7 @@ struct trace_arg
107 static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
108 static _Unwind_VRS_Result (*unwind_vrs_get) (_Unwind_Context *,
109 _Unwind_VRS_RegClass,
110 @@ -42,6 +43,10 @@ static void backtrace_init (void)
115 +# define unwind_backtrace _Unwind_Backtrace
116 +# define unwind_vrs_get _Unwind_VRS_Get
118 /* This function is identical to "_Unwind_GetGR", except that it uses
119 "unwind_vrs_get" instead of "_Unwind_VRS_Get". */
120 static inline _Unwind_Word
121 @@ -80,8 +85,10 @@ int backtrace (void **array, int size)
123 struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
126 if (unwind_backtrace == NULL)
131 unwind_backtrace (backtrace_helper, &arg);
132 diff --git a/libubacktrace/backtrace.c b/libubacktrace/backtrace.c
133 index fdd5981..1e0a0ec 100644
134 --- a/libubacktrace/backtrace.c
135 +++ b/libubacktrace/backtrace.c
136 @@ -33,6 +33,7 @@ struct trace_arg
141 static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *);
142 static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *);
144 @@ -47,6 +48,10 @@ static void backtrace_init (void)
149 +# define unwind_backtrace _Unwind_Backtrace
150 +# define unwind_getip _Unwind_GetIP
153 static _Unwind_Reason_Code
154 backtrace_helper (struct _Unwind_Context *ctx, void *a)
155 @@ -71,8 +76,10 @@ int backtrace (void **array, int size)
157 struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
160 if (unwind_backtrace == NULL)
165 unwind_backtrace (backtrace_helper, &arg);