aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/debug
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-12-05 11:43:41 -0500
committerRuss Cox <rsc@golang.org>2014-12-05 11:43:41 -0500
commitb9c52302ff50e1299becd13f1b8c60fd69d30496 (patch)
treeec666ce5582986e19a6b50467ceaac13763f2602 /src/runtime/debug
parent41c6b84342b27353ed40aa3942ef8647631a322b (diff)
parent829b286f2c5dc450394c526cd91ba8c8bea9bac8 (diff)
downloadgo-b9c52302ff50e1299becd13f1b8c60fd69d30496.tar.xz
all: merge dev.cc (81884b89bd88) into default
With this change, default now contains Go 1.5 work. Any future bug fixes for Go 1.4 in the compilers or the runtime will have to be made directly to the release branch.
Diffstat (limited to 'src/runtime/debug')
-rw-r--r--src/runtime/debug/stubs.s6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/runtime/debug/stubs.s b/src/runtime/debug/stubs.s
index d56274f2dc..1e883b72c0 100644
--- a/src/runtime/debug/stubs.s
+++ b/src/runtime/debug/stubs.s
@@ -7,6 +7,12 @@
#ifdef GOARCH_arm
#define JMP B
#endif
+#ifdef GOARCH_power64
+#define JMP BR
+#endif
+#ifdef GOARCH_power64le
+#define JMP BR
+#endif
TEXT ·setMaxStack(SB),NOSPLIT,$0-0
JMP runtime·setMaxStack(SB)