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 /src/sync | |
| 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 'src/sync')
| -rw-r--r-- | src/sync/atomic/asm_ppc64x.s (renamed from src/sync/atomic/asm_power64x.s) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sync/atomic/asm_power64x.s b/src/sync/atomic/asm_ppc64x.s index 1130d3c16..bcd46c5cf 100644 --- a/src/sync/atomic/asm_power64x.s +++ b/src/sync/atomic/asm_ppc64x.s @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build power64 power64le +// +build ppc64 ppc64le #include "textflag.h" |