From: Russ Cox <rsc@golang.org>
Date: Thu, 4 Sep 2014 04:54:37 +0000 (-0400)
Subject: runtime: fix sigtrampPC on Windows
X-Git-Tag: go1.4beta1~548
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=996835887cd8472eadef961120de043a74724fa5;p=gostls13.git

runtime: fix sigtrampPC on Windows

The arm5 build breakage at CL 139110043 was caused by
calling funcPC on a lessstack defined as a struct{}.
That symbol ended up with a non-4-aligned address,
which caused the memory fault that broke the builders.
The definition of lessstack was fixed in CL 140880043.

Tracking that down suggested that it would be worth
looking for the same bug elsewhere in the directory.
This is the only one I found.

LGTM=bradfitz
R=golang-codereviews, dave, bradfitz
CC=dvyukov, golang-codereviews, iant, khr, r
https://golang.org/cl/134410043
---

diff --git a/src/pkg/runtime/traceback_windows.go b/src/pkg/runtime/traceback_windows.go
index 892bed04ca..89dc1336e3 100644
--- a/src/pkg/runtime/traceback_windows.go
+++ b/src/pkg/runtime/traceback_windows.go
@@ -10,7 +10,7 @@ import "unsafe"
 // The traceback needs to recognize it on link register architectures.
 var sigtrampPC uintptr
 
-var sigtramp struct{} // assembly function
+func sigtramp()
 
 func init() {
 	sigtrampPC = funcPC(sigtramp)