Merge "Fix libcorkscrew for x86 targets (bionic) as well as the host (glibc)."
diff --git a/libcorkscrew/arch-x86/backtrace-x86.c b/libcorkscrew/arch-x86/backtrace-x86.c
index a568c6d..01d9ed5 100644
--- a/libcorkscrew/arch-x86/backtrace-x86.c
+++ b/libcorkscrew/arch-x86/backtrace-x86.c
@@ -33,9 +33,21 @@
#include <sys/ptrace.h>
#include <cutils/log.h>
+#if defined(__BIONIC__)
+
+// Bionic offers the Linux kernel headers.
+#include <asm/sigcontext.h>
+#include <asm/ucontext.h>
+typedef struct ucontext ucontext_t;
+
+#else
+
+// glibc has its own renaming of the Linux kernel's structures.
#define __USE_GNU // For REG_EBP, REG_ESP, and REG_EIP.
#include <ucontext.h>
+#endif
+
/* Unwind state. */
typedef struct {
uint32_t ebp;
@@ -84,9 +96,15 @@
const ucontext_t* uc = (const ucontext_t*)sigcontext;
unwind_state_t state;
+#if defined(__BIONIC__)
+ state.ebp = uc->uc_mcontext.ebp;
+ state.esp = uc->uc_mcontext.esp;
+ state.eip = uc->uc_mcontext.eip;
+#else
state.ebp = uc->uc_mcontext.gregs[REG_EBP];
state.esp = uc->uc_mcontext.gregs[REG_ESP];
state.eip = uc->uc_mcontext.gregs[REG_EIP];
+#endif
memory_t memory;
init_memory(&memory, map_info_list);