diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-07-26 20:20:22 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-07-26 20:20:22 +0000 |
| commit | 993323a14f46c25b18c5b9c69d577a4907c9e04c (patch) | |
| tree | 298a0c4ff092f4d7bfeb99e6568bc49d0413a100 | |
| parent | a7473dc5b57a7c890f52cf9d90a91d75d3d69a9e (diff) | |
| download | gcc-993323a14f46c25b18c5b9c69d577a4907c9e04c.zip gcc-993323a14f46c25b18c5b9c69d577a4907c9e04c.tar.gz gcc-993323a14f46c25b18c5b9c69d577a4907c9e04c.tar.bz2 | |
runtime: handle Alpha GNU/Linux in getSiginfo
Patch by Uros Bizjak.
Reviewed-on: https://go-review.googlesource.com/51370
From-SVN: r250588
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/go-signal.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 78905fe..722c0a1 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 d274865..8c7ecba 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; |