diff options
| author | Austin Clements <austin@google.com> | 2014-10-22 15:51:54 -0400 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2014-10-22 15:51:54 -0400 |
| commit | fc92f8a400cf3e4d053940e0b86b72d6de27d67a (patch) | |
| tree | ad0b517f2a9cd798c909e59d982b9061f16c0348 /src/runtime/panic.go | |
| parent | 48b04a95e5f719cbef174124780dce00bb410c2c (diff) | |
| parent | b8d4cd490ddd8ba298b5347d3e72316df768565c (diff) | |
| download | go-fc92f8a400cf3e4d053940e0b86b72d6de27d67a.tar.gz | |
[dev.power64] all: merge default into dev.power64
This brings dev.power64 up-to-date with the current tip of
default. go_bootstrap is still panicking with a bad defer
when initializing the runtime (even on amd64).
LGTM=rsc
R=rsc
CC=golang-codereviews
https://codereview.appspot.com/152570049
Diffstat (limited to 'src/runtime/panic.go')
| -rw-r--r-- | src/runtime/panic.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/panic.go b/src/runtime/panic.go index 685ff5ca0..91b5da294 100644 --- a/src/runtime/panic.go +++ b/src/runtime/panic.go @@ -61,7 +61,7 @@ func deferproc(siz int32, fn *funcval) { // arguments of fn follow fn // we can only call nosplit routines. argp := uintptr(unsafe.Pointer(&fn)) argp += unsafe.Sizeof(fn) - if GOARCH == "arm" { + if GOARCH == "arm" || GOARCH == "power64" || GOARCH == "power64le" { argp += ptrSize // skip caller's saved link register } mp := acquirem() @@ -494,12 +494,12 @@ func throw(s *byte) { //go:nosplit func gothrow(s string) { + print("fatal error: ", s, "\n") gp := getg() if gp.m.throwing == 0 { gp.m.throwing = 1 } startpanic() - print("fatal error: ", s, "\n") dopanic(0) *(*int)(nil) = 0 // not reached } |