From 993323a14f46c25b18c5b9c69d577a4907c9e04c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 26 Jul 2017 20:20:22 +0000 Subject: [PATCH] runtime: handle Alpha GNU/Linux in getSiginfo Patch by Uros Bizjak. Reviewed-on: https://go-review.googlesource.com/51370 From-SVN: r250588 --- gcc/go/gofrontend/MERGE | 2 +- libgo/runtime/go-signal.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 78905fe39c4..722c0a1ab06 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -61ce3b80ab20cb1f16960c1784bc0937abaa440a +feb26fbb5065eadfe1f8610e9b74b3749a87c52d The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c index d274865074f..8c7ecbae3b5 100644 --- a/libgo/runtime/go-signal.c +++ b/libgo/runtime/go-signal.c @@ -215,6 +215,11 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused))) ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[REG_EIP]; #endif #endif +#ifdef __alpha__ + #ifdef __linux__ + ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.sc_pc; + #endif +#endif #ifdef __PPC__ #ifdef __linux__ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip; -- 2.30.2