From 26c9bbf736f97d8f72c20ed3853352484a77c72f Mon Sep 17 00:00:00 2001 From: Shenghou Ma Date: Mon, 11 Aug 2014 23:32:08 -0400 Subject: [PATCH] [dev.power64] runtime: rename traceback_arm.c to traceback_lr.c Also make it more portable by not hardcoding pointer sizes. LGTM=rsc R=rsc, iant CC=golang-codereviews https://golang.org/cl/127780043 --- src/pkg/runtime/{traceback_arm.c => traceback_lr.c} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename src/pkg/runtime/{traceback_arm.c => traceback_lr.c} (99%) diff --git a/src/pkg/runtime/traceback_arm.c b/src/pkg/runtime/traceback_lr.c similarity index 99% rename from src/pkg/runtime/traceback_arm.c rename to src/pkg/runtime/traceback_lr.c index 778d95a28b..d8fcddf68b 100644 --- a/src/pkg/runtime/traceback_arm.c +++ b/src/pkg/runtime/traceback_lr.c @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// +build arm power64 power64le + #include "runtime.h" #include "arch_GOARCH.h" #include "malloc.h" @@ -267,7 +269,7 @@ runtime·gentraceback(uintptr pc0, uintptr sp0, uintptr lr0, G *gp, int32 skip, // sighandler saves the lr on stack before faking a call to sigpanic if(waspanic) { x = *(uintptr*)frame.sp; - frame.sp += 4; + frame.sp += sizeof(uintptr); frame.fn = f = runtime·findfunc(frame.pc); if(f == nil) frame.pc = x; -- 2.50.0