diff options
| author | Russ Cox <rsc@golang.org> | 2014-12-05 20:34:45 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-12-05 20:34:45 -0500 |
| commit | 9ec47922b8593000b20bd3bac2db330a98229949 (patch) | |
| tree | edc89cf42f596da1464550c2e01605bfd826aa67 /test/nosplit.go | |
| parent | f83565bc02ff8dbf9bb7d72a863f63c18361665d (diff) | |
| parent | ffc214da93bb6958b83ded0eff1bd2de21e82431 (diff) | |
| download | go-9ec47922b8593000b20bd3bac2db330a98229949.tar.gz | |
all: merge dev.garbage (d1238958d4ae) into default branch
When we start work on Gerrit, ppc64 and garbage collection
work will continue in the master branch, not the dev branches.
(We may still use dev branches for other things later, but
these are ready to be merged, and doing it now, before moving
to Git means we don't have to have dev branches working
in the Gerrit workflow on day one.)
TBR=rlh
CC=golang-codereviews
https://codereview.appspot.com/183140043
Diffstat (limited to 'test/nosplit.go')
| -rw-r--r-- | test/nosplit.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/nosplit.go b/test/nosplit.go index 799f2c533..93fb133eb 100644 --- a/test/nosplit.go +++ b/test/nosplit.go @@ -127,7 +127,7 @@ main 136 nosplit; REJECT # Calling a nosplit function from a nosplit function requires # having room for the saved caller PC and the called frame. # Because ARM doesn't save LR in the leaf, it gets an extra 4 bytes. -# Because Power64 doesn't save LR in the leaf, it gets an extra 8 bytes. +# Because ppc64 doesn't save LR in the leaf, it gets an extra 8 bytes. main 112 nosplit call f; f 0 nosplit main 116 nosplit call f; f 0 nosplit main 120 nosplit call f; f 0 nosplit; REJECT amd64 @@ -139,7 +139,7 @@ main 136 nosplit call f; f 0 nosplit; REJECT # Calling a splitting function from a nosplit function requires # having room for the saved caller PC of the call but also the # saved caller PC for the call to morestack. -# Again the ARM and Power64 work in less space. +# Again the ARM and ppc64 work in less space. main 104 nosplit call f; f 0 call f main 108 nosplit call f; f 0 call f main 112 nosplit call f; f 0 call f; REJECT amd64 @@ -237,7 +237,7 @@ TestCases: var buf bytes.Buffer ptrSize := 4 switch goarch { - case "power64", "power64le": + case "ppc64", "ppc64le": ptrSize = 8 fmt.Fprintf(&buf, "#define CALL BL\n#define REGISTER (CTR)\n#define RET RETURN\n") case "arm": |