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/os | |
| 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/os')
| -rw-r--r-- | src/os/signal/sig.s | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/os/signal/sig.s b/src/os/signal/sig.s index d54c284b5..1826c37fb 100644 --- a/src/os/signal/sig.s +++ b/src/os/signal/sig.s @@ -4,13 +4,19 @@ // Assembly to get into package runtime without using exported symbols. -// +build amd64 amd64p32 arm 386 +// +build amd64 amd64p32 arm 386 power64 power64le #include "textflag.h" #ifdef GOARCH_arm #define JMP B #endif +#ifdef GOARCH_power64 +#define JMP BR +#endif +#ifdef GOARCH_power64le +#define JMP BR +#endif TEXT ·signal_disable(SB),NOSPLIT,$0 JMP runtime·signal_disable(SB) |