From patchwork Tue Nov 13 06:49:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Get sparc building again after ASAN merge. From: David Miller X-Patchwork-Id: 198549 Message-Id: <20121113.014955.1285365295469482183.davem@davemloft.net> To: gcc-patches@gcc.gnu.org Date: Tue, 13 Nov 2012 01:49:55 -0500 (EST) libsanitizer/ * asan/asan_linux.cc (GetPcSpBp): Add sparc support. --- libsanitizer/ChangeLog.asan | 4 ++++ libsanitizer/asan/asan_linux.cc | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/libsanitizer/ChangeLog.asan b/libsanitizer/ChangeLog.asan index 7fe3c0c..5592092 100644 --- a/libsanitizer/ChangeLog.asan +++ b/libsanitizer/ChangeLog.asan @@ -1,3 +1,7 @@ +2012-11-12 David S. Miller + + * asan/asan_linux.cc (GetPcSpBp): Add sparc support. + 2012-10-29 Wei Mi Initial checkin: migrate asan runtime from llvm. diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc index 2922740..ea7ee9e 100644 --- a/libsanitizer/asan/asan_linux.cc +++ b/libsanitizer/asan/asan_linux.cc @@ -66,6 +66,20 @@ void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) { *pc = ucontext->uc_mcontext.gregs[REG_EIP]; *bp = ucontext->uc_mcontext.gregs[REG_EBP]; *sp = ucontext->uc_mcontext.gregs[REG_ESP]; +# elif defined(__sparc__) + ucontext_t *ucontext = (ucontext_t*)context; + uptr *stk_ptr; +# if defined (__arch64__) + *pc = ucontext->uc_mcontext.mc_gregs[MC_PC]; + *sp = ucontext->uc_mcontext.mc_gregs[MC_O6]; + stk_ptr = (uptr *) (*sp + 2047); + *bp = stk_ptr[15]; +# else + *pc = ucontext->uc_mcontext.gregs[REG_PC]; + *sp = ucontext->uc_mcontext.gregs[REG_O6]; + stk_ptr = (uptr *) *sp; + *bp = stk_ptr[15]; +# endif #else # error "Unsupported arch" #endif