Merge branch 'upstream' into tizen

[platform/upstream/libunwind.git] / src / arm / Gtrace.c

diff --git a/src/arm/Gtrace.c b/src/arm/Gtrace.c
index 135563a..7454428 100644 (file)
--- a/src/arm/Gtrace.c
+++ b/src/arm/Gtrace.c
@@ -503,7 +503,7 @@ tdep_trace (unw_cursor_t *cursor, void **buffer, int *size)
 
     case UNW_ARM_FRAME_SIGRETURN:
       cfa = cfa + f->cfa_reg_offset; /* cfa now points to ucontext_t.  */
-
+#if defined(__linux__)
       ACCESS_MEM_FAST(ret, c->validate, d, cfa + LINUX_SC_PC_OFF, pc);
       if (likely(ret >= 0))
         ACCESS_MEM_FAST(ret, c->validate, d, cfa + LINUX_SC_R7_OFF, r7);
@@ -513,6 +513,7 @@ tdep_trace (unw_cursor_t *cursor, void **buffer, int *size)
          doesn't save the link register in the prologue, e.g. kill. */
       if (likely(ret >= 0))
         ACCESS_MEM_FAST(ret, c->validate, d, cfa + LINUX_SC_LR_OFF, lr);
+#endif
 
       /* Resume stack at signal restoration point. The stack is not
          necessarily continuous here, especially with sigaltstack(). */
@@ -522,6 +523,9 @@ tdep_trace (unw_cursor_t *cursor, void **buffer, int *size)
       d->use_prev_instr = 0;
       break;
 
+    case UNW_ARM_FRAME_SYSCALL:
+      break;
+
     default:
       /* We cannot trace through this frame, give up and tell the
           caller we had to stop.  Data collected so far may still be