diff options
| author | Keith Randall <khr@golang.org> | 2015-11-16 13:20:16 -0800 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2015-11-16 17:19:42 -0800 |
| commit | 4304fbc4d0e024d948ef637d19d89b0b6359788f (patch) | |
| tree | e178b3d8220239ad50be4ce974b965533950c775 /src/runtime/runtime-gdb_test.go | |
| parent | 75102afce77f1376b0aab3f1d5fee9b881d0f68a (diff) | |
| parent | 2c11164db52bca183da4c3ac09ceac7565835d53 (diff) | |
| download | go-4304fbc4d0e024d948ef637d19d89b0b6359788f.tar.xz | |
[dev.ssa] Merge remote-tracking branch 'origin/master' into mergebranch
Conflicts:
src/cmd/compile/internal/gc/racewalk.go
src/cmd/internal/obj/stack.go
src/cmd/internal/obj/x86/obj6.go
src/runtime/stack.go
test/nilptr3.go
test/nosplit.go
Change-Id: Ie6053eb1577fd73e8243651f25c0f1fc765ae660
Diffstat (limited to 'src/runtime/runtime-gdb_test.go')
| -rw-r--r-- | src/runtime/runtime-gdb_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go index 48567f1b9c..9f0fdfa17e 100644 --- a/src/runtime/runtime-gdb_test.go +++ b/src/runtime/runtime-gdb_test.go @@ -100,7 +100,7 @@ func TestGdbPython(t *testing.T) { // stack frames on RISC architectures. canBackTrace := false switch runtime.GOARCH { - case "amd64", "386", "ppc64", "ppc64le", "arm", "arm64": + case "amd64", "386", "ppc64", "ppc64le", "arm", "arm64", "mips64", "mips64le": canBackTrace = true args = append(args, "-ex", "echo BEGIN goroutine 2 bt\n", |