From: Shenghou Ma <minux@golang.org>
Date: Tue, 12 Aug 2014 03:32:08 +0000 (-0400)
Subject: [dev.power64] runtime: rename traceback_arm.c to traceback_lr.c
X-Git-Tag: go1.5beta1~2684^2~25^2~87
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=26c9bbf736f97d8f72c20ed3853352484a77c72f;p=gostls13.git

[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
---

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;