diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-14 12:10:52 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-14 12:10:52 -0500 |
| commit | 3e804631d905162d9e0fc1eba63bce6f95965a24 (patch) | |
| tree | 5a3c5fe864320ef097c2cd8808620d15a1c21913 /src/runtime/gcinfo_test.go | |
| parent | 9ad6b7e322deaf72e3c373952249dd078d6bd30e (diff) | |
| parent | 743bdf612a63d631bac88a6b857094152ac33d5c (diff) | |
| download | go-3e804631d905162d9e0fc1eba63bce6f95965a24.tar.gz go-3e804631d905162d9e0fc1eba63bce6f95965a24.zip | |
[dev.cc] all: merge dev.power64 (7667e41f3ced) into dev.cc
This is to reduce the delta between dev.cc and dev.garbage to just garbage collector changes.
These are the files that had merge conflicts and have been edited by hand:
malloc.go
mem_linux.go
mgc.go
os1_linux.go
proc1.go
panic1.go
runtime1.go
LGTM=austin
R=austin
CC=golang-codereviews
https://golang.org/cl/174180043
Diffstat (limited to 'src/runtime/gcinfo_test.go')
| -rw-r--r-- | src/runtime/gcinfo_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/gcinfo_test.go b/src/runtime/gcinfo_test.go index 1443c2c134..2b45c8184d 100644 --- a/src/runtime/gcinfo_test.go +++ b/src/runtime/gcinfo_test.go @@ -134,7 +134,7 @@ func infoBigStruct() []byte { BitsScalar, BitsScalar, BitsScalar, BitsScalar, // t int; y uint16; u uint64 BitsPointer, BitsDead, // i string } - case "amd64": + case "amd64", "power64", "power64le": return []byte{ BitsPointer, // q *int BitsScalar, BitsScalar, BitsScalar, // w byte; e [17]byte |