commit eb5de42c371ebe616275dec48c5a886b95bdb400
author Andreas Gampe <agampe@google.com> Fri Dec 05 19:29:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 05 19:29:43 2014 +0000
tree c6a227b2e088a3d5339e38eda7102cb9b2d4358b
parent 7644390265b98586b4a51e2f916dcb79ada780db
parent dec17cc63e6e8eb3034ecca71fdd3ce0a1705913

am dec17cc6: am 8d344794: Libunwind: Fix unused variables

* commit 'dec17cc63e6e8eb3034ecca71fdd3ce0a1705913':
  Libunwind: Fix unused variables

src/x86/Gos-linux.c

diff --git a/src/x86/Gos-linux.c b/src/x86/Gos-linux.c
index 4c53b43..884c7fd 100644
--- a/src/x86/Gos-linux.c
+++ b/src/x86/Gos-linux.c
@@ -283,7 +283,9 @@
 x86_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg)
 {
   struct cursor *c = (struct cursor *) cursor;
+#if !defined(__ANDROID__)
   ucontext_t *uc = c->uc;
+#endif
 
   /* Ensure c->pi is up-to-date.  On x86, it's relatively common to be
      missing DWARF unwind info.  We don't want to fail in that case,
@@ -294,6 +296,7 @@
   if (unlikely (c->sigcontext_format != X86_SCF_NONE))
     {
       struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr;
+      (void)sc;
 
       Debug (8, "resuming at ip=%x via sigreturn(%p)\n", c->dwarf.ip, sc);