From 71c10c484e7dc113396cccb7e503befb759c6346 Mon Sep 17 00:00:00 2001 From: Filippo Arcidiacono Date: Thu, 9 May 2013 11:42:23 +0200 Subject: libubacktrace: fix backtrace for statically linked application libgcc_s.so's unwinder could not access unwind tables of statically linked binaries, so we really want to use _Unwind_* stuff from libgcc_eh.a. It required to build backtrace.c differentiating between shared and static case. Signed-off-by: Filippo Arcidiacono Signed-off-by: Carmelo Amoroso --- libubacktrace/backtrace.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libubacktrace/backtrace.c') diff --git a/libubacktrace/backtrace.c b/libubacktrace/backtrace.c index 0a72bae5e..08a7010e7 100644 --- a/libubacktrace/backtrace.c +++ b/libubacktrace/backtrace.c @@ -34,6 +34,7 @@ struct trace_arg int cnt, size; }; +#ifdef SHARED static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *); static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *); @@ -48,6 +49,10 @@ static void backtrace_init (void) abort(); } } +#else +# define unwind_backtrace _Unwind_Backtrace +# define unwind_getip _Unwind_GetIP +#endif static _Unwind_Reason_Code backtrace_helper (struct _Unwind_Context *ctx, void *a) @@ -72,8 +77,10 @@ int backtrace (void **array, int size) { struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; +#ifdef SHARED if (unwind_backtrace == NULL) backtrace_init(); +#endif if (size >= 1) unwind_backtrace (backtrace_helper, &arg); -- cgit v1.2.3