summaryrefslogtreecommitdiffstats
path: root/libcorkscrew
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-01-30 02:04:28 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-01-30 02:04:28 +0000
commit59b5294f0ead4f50dbd3b45b6602d145cf9d3afd (patch)
tree9335ad1c423e5542084644c8e79c09eab14aff3c /libcorkscrew
parentb99d52944f61aebdac427a490bfed2ae8cccbc10 (diff)
parent03a2597c31fd7466600bca0623d4bfabf99b5481 (diff)
downloadsystem_core-59b5294f0ead4f50dbd3b45b6602d145cf9d3afd.zip
system_core-59b5294f0ead4f50dbd3b45b6602d145cf9d3afd.tar.gz
system_core-59b5294f0ead4f50dbd3b45b6602d145cf9d3afd.tar.bz2
Merge "Switch arm libcorkscrew over to <sys/ucontext.h>."
Diffstat (limited to 'libcorkscrew')
-rw-r--r--libcorkscrew/arch-arm/backtrace-arm.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/libcorkscrew/arch-arm/backtrace-arm.c b/libcorkscrew/arch-arm/backtrace-arm.c
index 7bd0d8f..751efbf 100644
--- a/libcorkscrew/arch-arm/backtrace-arm.c
+++ b/libcorkscrew/arch-arm/backtrace-arm.c
@@ -62,19 +62,7 @@
#include <elf.h>
#include <cutils/log.h>
-#if !defined(__BIONIC_HAVE_UCONTEXT_T)
-/* Old versions of the Android <signal.h> didn't define ucontext_t. */
-#include <asm/sigcontext.h> /* Ensure 'struct sigcontext' is defined. */
-
-/* Machine context at the time a signal was raised. */
-typedef struct ucontext {
- uint32_t uc_flags;
- struct ucontext* uc_link;
- stack_t uc_stack;
- struct sigcontext uc_mcontext;
- uint32_t uc_sigmask;
-} ucontext_t;
-#endif /* !__BIONIC_HAVE_UCONTEXT_T */
+#include <ucontext.h>
/* Unwind state. */
typedef struct {