diff options
author | Russ Cox <rsc@golang.org> | 2014-12-05 19:13:20 -0500 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2014-12-05 19:13:20 -0500 |
commit | ffc214da93bb6958b83ded0eff1bd2de21e82431 (patch) | |
tree | ab17ef2c8f58390603cf2772d4905ca90e861b54 /src/runtime | |
parent | 2c77ac0cd1a89e7966203f8f519a92fa19f0d66d (diff) | |
download | go-ffc214da93bb6958b83ded0eff1bd2de21e82431.tar.gz |
all: power64 is now ppc64
Fixes issue 8654.
LGTM=austin
R=austin
CC=golang-codereviews
https://codereview.appspot.com/180600043
Diffstat (limited to 'src/runtime')
-rw-r--r-- | src/runtime/arch1_ppc64.go (renamed from src/runtime/arch1_power64.go) | 0 | ||||
-rw-r--r-- | src/runtime/arch1_ppc64le.go (renamed from src/runtime/arch1_power64le.go) | 0 | ||||
-rw-r--r-- | src/runtime/arch_ppc64.go (renamed from src/runtime/arch_power64.go) | 0 | ||||
-rw-r--r-- | src/runtime/arch_ppc64le.go (renamed from src/runtime/arch_power64le.go) | 0 | ||||
-rw-r--r-- | src/runtime/asm_ppc64x.s (renamed from src/runtime/asm_power64x.s) | 6 | ||||
-rw-r--r-- | src/runtime/atomic_ppc64x.go (renamed from src/runtime/atomic_power64x.go) | 2 | ||||
-rw-r--r-- | src/runtime/atomic_ppc64x.s (renamed from src/runtime/atomic_power64x.s) | 2 | ||||
-rw-r--r-- | src/runtime/debug/stubs.s | 4 | ||||
-rw-r--r-- | src/runtime/defs3_linux.go | 2 | ||||
-rw-r--r-- | src/runtime/defs_linux_ppc64.go (renamed from src/runtime/defs_linux_power64.go) | 0 | ||||
-rw-r--r-- | src/runtime/defs_linux_ppc64le.go (renamed from src/runtime/defs_linux_power64le.go) | 0 | ||||
-rw-r--r-- | src/runtime/gcinfo_test.go | 2 | ||||
-rw-r--r-- | src/runtime/lfstack_linux_ppc64x.go (renamed from src/runtime/lfstack_linux_power64x.go) | 4 | ||||
-rw-r--r-- | src/runtime/memclr_ppc64x.s (renamed from src/runtime/memclr_power64x.s) | 2 | ||||
-rw-r--r-- | src/runtime/memmove_ppc64x.s (renamed from src/runtime/memmove_power64x.s) | 2 | ||||
-rw-r--r-- | src/runtime/noasm.go | 2 | ||||
-rw-r--r-- | src/runtime/panic.go | 2 | ||||
-rw-r--r-- | src/runtime/panic1.go | 2 | ||||
-rw-r--r-- | src/runtime/rt0_linux_ppc64.s (renamed from src/runtime/rt0_linux_power64.s) | 2 | ||||
-rw-r--r-- | src/runtime/rt0_linux_ppc64le.s (renamed from src/runtime/rt0_linux_power64le.s) | 2 | ||||
-rw-r--r-- | src/runtime/signal_linux_ppc64x.go (renamed from src/runtime/signal_linux_power64x.go) | 2 | ||||
-rw-r--r-- | src/runtime/signal_ppc64x.go (renamed from src/runtime/signal_power64x.go) | 2 | ||||
-rw-r--r-- | src/runtime/sys_linux_ppc64x.s (renamed from src/runtime/sys_linux_power64x.s) | 8 | ||||
-rw-r--r-- | src/runtime/sys_ppc64x.go (renamed from src/runtime/sys_power64x.go) | 2 | ||||
-rw-r--r-- | src/runtime/thunk.s | 4 | ||||
-rw-r--r-- | src/runtime/zgoarch_386.go | 4 | ||||
-rw-r--r-- | src/runtime/zgoarch_amd64.go | 4 | ||||
-rw-r--r-- | src/runtime/zgoarch_amd64p32.go | 4 | ||||
-rw-r--r-- | src/runtime/zgoarch_arm.go | 4 | ||||
-rw-r--r-- | src/runtime/zgoarch_ppc64.go (renamed from src/runtime/zgoarch_power64.go) | 6 | ||||
-rw-r--r-- | src/runtime/zgoarch_ppc64le.go (renamed from src/runtime/zgoarch_power64le.go) | 6 |
31 files changed, 41 insertions, 41 deletions
diff --git a/src/runtime/arch1_power64.go b/src/runtime/arch1_ppc64.go index 01e2b70f9..01e2b70f9 100644 --- a/src/runtime/arch1_power64.go +++ b/src/runtime/arch1_ppc64.go diff --git a/src/runtime/arch1_power64le.go b/src/runtime/arch1_ppc64le.go index 6580732a3..6580732a3 100644 --- a/src/runtime/arch1_power64le.go +++ b/src/runtime/arch1_ppc64le.go diff --git a/src/runtime/arch_power64.go b/src/runtime/arch_ppc64.go index 270cd7b95..270cd7b95 100644 --- a/src/runtime/arch_power64.go +++ b/src/runtime/arch_ppc64.go diff --git a/src/runtime/arch_power64le.go b/src/runtime/arch_ppc64le.go index 270cd7b95..270cd7b95 100644 --- a/src/runtime/arch_power64le.go +++ b/src/runtime/arch_ppc64le.go diff --git a/src/runtime/asm_power64x.s b/src/runtime/asm_ppc64x.s index 3f2ab6d0e..bfce3d0fd 100644 --- a/src/runtime/asm_power64x.s +++ b/src/runtime/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 "go_asm.h" #include "go_tls.h" @@ -550,7 +550,7 @@ TEXT runtime·atomicor8(SB), NOSPLIT, $0-9 // R5 = (R3 << 0) & ~3 RLDCR $0, R3, $~3, R5 // Compute val shift. -#ifdef GOARCH_power64 +#ifdef GOARCH_ppc64 // Big endian. ptr = ptr ^ 3 XOR $3, R3 #endif @@ -669,7 +669,7 @@ TEXT runtime·cputicks(SB),NOSPLIT,$0-8 MOVD R3, ret+0(FP) RETURN -// AES hashing not implemented for Power +// AES hashing not implemented for ppc64 TEXT runtime·aeshash(SB),NOSPLIT,$-8-0 MOVW (R0), R1 TEXT runtime·aeshash32(SB),NOSPLIT,$-8-0 diff --git a/src/runtime/atomic_power64x.go b/src/runtime/atomic_ppc64x.go index a0dcf514b..4080af6a5 100644 --- a/src/runtime/atomic_power64x.go +++ b/src/runtime/atomic_ppc64x.go @@ -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 package runtime diff --git a/src/runtime/atomic_power64x.s b/src/runtime/atomic_ppc64x.s index e72871761..7ee08213d 100644 --- a/src/runtime/atomic_power64x.s +++ b/src/runtime/atomic_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" diff --git a/src/runtime/debug/stubs.s b/src/runtime/debug/stubs.s index 1e883b72c..b117063e7 100644 --- a/src/runtime/debug/stubs.s +++ b/src/runtime/debug/stubs.s @@ -7,10 +7,10 @@ #ifdef GOARCH_arm #define JMP B #endif -#ifdef GOARCH_power64 +#ifdef GOARCH_ppc64 #define JMP BR #endif -#ifdef GOARCH_power64le +#ifdef GOARCH_ppc64le #define JMP BR #endif diff --git a/src/runtime/defs3_linux.go b/src/runtime/defs3_linux.go index 3551a4fa9..489c130d0 100644 --- a/src/runtime/defs3_linux.go +++ b/src/runtime/defs3_linux.go @@ -7,7 +7,7 @@ /* Input to cgo -cdefs -GOARCH=power64 cgo -cdefs defs_linux.go defs3_linux.go > defs_linux_power64.h +GOARCH=ppc64 cgo -cdefs defs_linux.go defs3_linux.go > defs_linux_ppc64.h */ package runtime diff --git a/src/runtime/defs_linux_power64.go b/src/runtime/defs_linux_ppc64.go index f90b84874..f90b84874 100644 --- a/src/runtime/defs_linux_power64.go +++ b/src/runtime/defs_linux_ppc64.go diff --git a/src/runtime/defs_linux_power64le.go b/src/runtime/defs_linux_ppc64le.go index f90b84874..f90b84874 100644 --- a/src/runtime/defs_linux_power64le.go +++ b/src/runtime/defs_linux_ppc64le.go diff --git a/src/runtime/gcinfo_test.go b/src/runtime/gcinfo_test.go index 2b45c8184..93535ae9d 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", "power64", "power64le": + case "amd64", "ppc64", "ppc64le": return []byte{ BitsPointer, // q *int BitsScalar, BitsScalar, BitsScalar, // w byte; e [17]byte diff --git a/src/runtime/lfstack_linux_power64x.go b/src/runtime/lfstack_linux_ppc64x.go index 89e389fc7..7ed502558 100644 --- a/src/runtime/lfstack_linux_power64x.go +++ b/src/runtime/lfstack_linux_ppc64x.go @@ -2,14 +2,14 @@ // 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 // +build linux package runtime import "unsafe" -// On Power64, Linux limits the user address space to 46 bits (see +// On ppc64, Linux limits the user address space to 46 bits (see // TASK_SIZE_USER64 in the Linux kernel). This has grown over time, // so here we allow 48 bit addresses. // diff --git a/src/runtime/memclr_power64x.s b/src/runtime/memclr_ppc64x.s index dfad64b6f..535faa1c0 100644 --- a/src/runtime/memclr_power64x.s +++ b/src/runtime/memclr_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" diff --git a/src/runtime/memmove_power64x.s b/src/runtime/memmove_ppc64x.s index 2b04d8319..23725ed0f 100644 --- a/src/runtime/memmove_power64x.s +++ b/src/runtime/memmove_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" diff --git a/src/runtime/noasm.go b/src/runtime/noasm.go index 43c16860b..1337fc9a1 100644 --- a/src/runtime/noasm.go +++ b/src/runtime/noasm.go @@ -5,7 +5,7 @@ // Routines that are implemented in assembly in asm_{amd64,386}.s // but are implemented in Go for arm. -// +build arm power64 power64le +// +build arm ppc64 ppc64le package runtime diff --git a/src/runtime/panic.go b/src/runtime/panic.go index 95e780b1d..7ec084acf 100644 --- a/src/runtime/panic.go +++ b/src/runtime/panic.go @@ -66,7 +66,7 @@ func deferproc(siz int32, fn *funcval) { // arguments of fn follow fn // we can only call nosplit routines. argp := uintptr(unsafe.Pointer(&fn)) argp += unsafe.Sizeof(fn) - if GOARCH == "arm" || GOARCH == "power64" || GOARCH == "power64le" { + if GOARCH == "arm" || GOARCH == "ppc64" || GOARCH == "ppc64le" { argp += ptrSize // skip caller's saved link register } callerpc := getcallerpc(unsafe.Pointer(&siz)) diff --git a/src/runtime/panic1.go b/src/runtime/panic1.go index 17379f963..96f07a0ca 100644 --- a/src/runtime/panic1.go +++ b/src/runtime/panic1.go @@ -12,7 +12,7 @@ import "unsafe" //uint32 runtime·panicking; var paniclk mutex -const hasLinkRegister = GOARCH == "arm" || GOARCH == "power64" || GOARCH == "power64le" +const hasLinkRegister = GOARCH == "arm" || GOARCH == "ppc64" || GOARCH == "ppc64le" // Unwind the stack after a deferred function calls recover // after a panic. Then arrange to continue running as though diff --git a/src/runtime/rt0_linux_power64.s b/src/runtime/rt0_linux_ppc64.s index 970b6a673..33bbbbd1b 100644 --- a/src/runtime/rt0_linux_power64.s +++ b/src/runtime/rt0_linux_ppc64.s @@ -1,7 +1,7 @@ #include "textflag.h" // actually a function descriptor for _main<>(SB) -TEXT _rt0_power64_linux(SB),NOSPLIT,$0 +TEXT _rt0_ppc64_linux(SB),NOSPLIT,$0 DWORD $_main<>(SB) DWORD $0 DWORD $0 diff --git a/src/runtime/rt0_linux_power64le.s b/src/runtime/rt0_linux_ppc64le.s index 85ce84733..a3b3cea0b 100644 --- a/src/runtime/rt0_linux_power64le.s +++ b/src/runtime/rt0_linux_ppc64le.s @@ -1,6 +1,6 @@ #include "textflag.h" -TEXT _rt0_power64le_linux(SB),NOSPLIT,$0 +TEXT _rt0_ppc64le_linux(SB),NOSPLIT,$0 BR _main<>(SB) TEXT _main<>(SB),NOSPLIT,$-8 diff --git a/src/runtime/signal_linux_power64x.go b/src/runtime/signal_linux_ppc64x.go index 0a406b31f..da3afc9e9 100644 --- a/src/runtime/signal_linux_power64x.go +++ b/src/runtime/signal_linux_ppc64x.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // +build linux -// +build power64 power64le +// +build ppc64 ppc64le package runtime diff --git a/src/runtime/signal_power64x.go b/src/runtime/signal_ppc64x.go index fc83beb1b..ab32300f3 100644 --- a/src/runtime/signal_power64x.go +++ b/src/runtime/signal_ppc64x.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // +build linux -// +build power64 power64le +// +build ppc64 ppc64le package runtime diff --git a/src/runtime/sys_linux_power64x.s b/src/runtime/sys_linux_ppc64x.s index 395f657bf..4a4f440c5 100644 --- a/src/runtime/sys_linux_power64x.s +++ b/src/runtime/sys_linux_ppc64x.s @@ -3,10 +3,10 @@ // license that can be found in the LICENSE file. // +build linux -// +build power64 power64le +// +build ppc64 ppc64le // -// System calls and other sys.stuff for Power64, Linux +// System calls and other sys.stuff for ppc64, Linux // #include "go_asm.h" @@ -179,8 +179,8 @@ TEXT runtime·rt_sigaction(SB),NOSPLIT,$-8-36 MOVW R3, ret+32(FP) RETURN -#ifdef GOARCH_power64le -// power64le doesn't need function descriptors +#ifdef GOARCH_ppc64le +// ppc64le doesn't need function descriptors TEXT runtime·sigtramp(SB),NOSPLIT,$64 #else // function descriptor for the real sigtramp diff --git a/src/runtime/sys_power64x.go b/src/runtime/sys_ppc64x.go index 90ebde7b4..b0c0331fc 100644 --- a/src/runtime/sys_power64x.go +++ b/src/runtime/sys_ppc64x.go @@ -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 package runtime diff --git a/src/runtime/thunk.s b/src/runtime/thunk.s index 241dd90af..0714dc198 100644 --- a/src/runtime/thunk.s +++ b/src/runtime/thunk.s @@ -9,10 +9,10 @@ #ifdef GOARCH_arm #define JMP B #endif -#ifdef GOARCH_power64 +#ifdef GOARCH_ppc64 #define JMP BR #endif -#ifdef GOARCH_power64le +#ifdef GOARCH_ppc64le #define JMP BR #endif diff --git a/src/runtime/zgoarch_386.go b/src/runtime/zgoarch_386.go index 057a746bb..8aa3da98d 100644 --- a/src/runtime/zgoarch_386.go +++ b/src/runtime/zgoarch_386.go @@ -8,5 +8,5 @@ const goarch_386 = 1 const goarch_amd64 = 0 const goarch_amd64p32 = 0 const goarch_arm = 0 -const goarch_power64 = 0 -const goarch_power64le = 0 +const goarch_ppc64 = 0 +const goarch_ppc64le = 0 diff --git a/src/runtime/zgoarch_amd64.go b/src/runtime/zgoarch_amd64.go index a71240726..eb4f31d7c 100644 --- a/src/runtime/zgoarch_amd64.go +++ b/src/runtime/zgoarch_amd64.go @@ -8,5 +8,5 @@ const goarch_386 = 0 const goarch_amd64 = 1 const goarch_amd64p32 = 0 const goarch_arm = 0 -const goarch_power64 = 0 -const goarch_power64le = 0 +const goarch_ppc64 = 0 +const goarch_ppc64le = 0 diff --git a/src/runtime/zgoarch_amd64p32.go b/src/runtime/zgoarch_amd64p32.go index 2b6a142bb..c2579e212 100644 --- a/src/runtime/zgoarch_amd64p32.go +++ b/src/runtime/zgoarch_amd64p32.go @@ -8,5 +8,5 @@ const goarch_386 = 0 const goarch_amd64 = 0 const goarch_amd64p32 = 1 const goarch_arm = 0 -const goarch_power64 = 0 -const goarch_power64le = 0 +const goarch_ppc64 = 0 +const goarch_ppc64le = 0 diff --git a/src/runtime/zgoarch_arm.go b/src/runtime/zgoarch_arm.go index 403021005..3098bed7a 100644 --- a/src/runtime/zgoarch_arm.go +++ b/src/runtime/zgoarch_arm.go @@ -8,5 +8,5 @@ const goarch_386 = 0 const goarch_amd64 = 0 const goarch_amd64p32 = 0 const goarch_arm = 1 -const goarch_power64 = 0 -const goarch_power64le = 0 +const goarch_ppc64 = 0 +const goarch_ppc64le = 0 diff --git a/src/runtime/zgoarch_power64.go b/src/runtime/zgoarch_ppc64.go index cc361f050..309732290 100644 --- a/src/runtime/zgoarch_power64.go +++ b/src/runtime/zgoarch_ppc64.go @@ -2,11 +2,11 @@ package runtime -const theGoarch = `power64` +const theGoarch = `ppc64` const goarch_386 = 0 const goarch_amd64 = 0 const goarch_amd64p32 = 0 const goarch_arm = 0 -const goarch_power64 = 1 -const goarch_power64le = 0 +const goarch_ppc64 = 1 +const goarch_ppc64le = 0 diff --git a/src/runtime/zgoarch_power64le.go b/src/runtime/zgoarch_ppc64le.go index 41294e61b..f4102ac1e 100644 --- a/src/runtime/zgoarch_power64le.go +++ b/src/runtime/zgoarch_ppc64le.go @@ -2,11 +2,11 @@ package runtime -const theGoarch = `power64le` +const theGoarch = `ppc64le` const goarch_386 = 0 const goarch_amd64 = 0 const goarch_amd64p32 = 0 const goarch_arm = 0 -const goarch_power64 = 0 -const goarch_power64le = 1 +const goarch_ppc64 = 0 +const goarch_ppc64le = 1 |