aboutsummaryrefslogtreecommitdiff
path: root/src/cmd
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2012-09-24 20:57:01 -0400
committerRuss Cox <rsc@golang.org>2012-09-24 20:57:01 -0400
commit10ea6519e4e61d47385ca7b7f60ca96856271de7 (patch)
tree97bbc154b3bb2b0d5807a359f31a7c72550bee5d /src/cmd
parentf8c58373e53a9399a9ea75f744c717fc59be3839 (diff)
downloadgo-10ea6519e4e61d47385ca7b7f60ca96856271de7.tar.xz
build: make int 64 bits on amd64
The assembly offsets were converted mechanically using code.google.com/p/rsc/cmd/asmlint. The instruction changes were done by hand. Fixes #2188. R=iant, r, bradfitz, remyoudompheng CC=golang-dev https://golang.org/cl/6550058
Diffstat (limited to 'src/cmd')
-rw-r--r--src/cmd/6g/galign.c6
-rw-r--r--src/cmd/6l/l.h2
-rw-r--r--src/cmd/cgo/main.go2
-rw-r--r--src/cmd/dist/goc2c.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/cmd/6g/galign.c b/src/cmd/6g/galign.c
index a5d10eb575..526c04c06a 100644
--- a/src/cmd/6g/galign.c
+++ b/src/cmd/6g/galign.c
@@ -17,8 +17,8 @@ vlong MAXWIDTH = 1LL<<50;
*/
Typedef typedefs[] =
{
- "int", TINT, TINT32,
- "uint", TUINT, TUINT32,
+ "int", TINT, TINT64,
+ "uint", TUINT, TUINT64,
"uintptr", TUINTPTR, TUINT64,
0
};
@@ -27,7 +27,7 @@ void
betypeinit(void)
{
widthptr = 8;
- widthint = 4;
+ widthint = 8;
zprog.link = P;
zprog.as = AGOK;
diff --git a/src/cmd/6l/l.h b/src/cmd/6l/l.h
index 408107f2cd..c2ae007790 100644
--- a/src/cmd/6l/l.h
+++ b/src/cmd/6l/l.h
@@ -41,7 +41,7 @@ enum
{
thechar = '6',
PtrSize = 8,
- IntSize = 4,
+ IntSize = 8,
// Loop alignment constants:
// want to align loop entry to LoopAlign-byte boundary,
diff --git a/src/cmd/cgo/main.go b/src/cmd/cgo/main.go
index a4ff51933e..83104e412c 100644
--- a/src/cmd/cgo/main.go
+++ b/src/cmd/cgo/main.go
@@ -132,7 +132,7 @@ var ptrSizeMap = map[string]int64{
var intSizeMap = map[string]int64{
"386": 4,
- "amd64": 4,
+ "amd64": 8,
"arm": 4,
}
diff --git a/src/cmd/dist/goc2c.c b/src/cmd/dist/goc2c.c
index cd14e6bc80..a103bce8d9 100644
--- a/src/cmd/dist/goc2c.c
+++ b/src/cmd/dist/goc2c.c
@@ -28,7 +28,7 @@ static Buf *output;
enum
{
- use64bitint = 0,
+ use64bitint = 1,
};
static int