summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-06 18:46:38 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-06 18:46:38 +0000
commitcaeb1102ce1942d2d7bded8a3d97c41927f52bc2 (patch)
tree7d1aeb00c516c09100f51f0c73af4edac9b0c684
parentc19ea58f4c22885970a0bfbed4086d53df4418da (diff)
downloadgcc-caeb1102ce1942d2d7bded8a3d97c41927f52bc2.tar.gz
compiler, runtime: Size of int is now 64 bits on x86_64.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193255 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/go/gofrontend/gogo.cc4
-rw-r--r--libgo/runtime/runtime.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc
index 3455a917f0a..5b566103ec8 100644
--- a/gcc/go/gofrontend/gogo.cc
+++ b/gcc/go/gofrontend/gogo.cc
@@ -23,8 +23,7 @@
// Class Gogo.
-Gogo::Gogo(Backend* backend, Linemap* linemap, int int_type_size,
- int pointer_size)
+Gogo::Gogo(Backend* backend, Linemap* linemap, int, int pointer_size)
: backend_(backend),
linemap_(linemap),
package_(NULL),
@@ -83,6 +82,7 @@ Gogo::Gogo(Backend* backend, Linemap* linemap, int int_type_size,
this->add_named_type(Type::make_complex_type("complex128", 128,
RUNTIME_TYPE_KIND_COMPLEX128));
+ int int_type_size = pointer_size;
if (int_type_size < 32)
int_type_size = 32;
this->add_named_type(Type::make_integer_type("uint", true,
diff --git a/libgo/runtime/runtime.h b/libgo/runtime/runtime.h
index 72e1eb2f8b9..6edeae5f9d9 100644
--- a/libgo/runtime/runtime.h
+++ b/libgo/runtime/runtime.h
@@ -41,8 +41,8 @@ typedef double float64 __attribute__ ((mode (DF)));
typedef signed int intptr __attribute__ ((mode (pointer)));
typedef unsigned int uintptr __attribute__ ((mode (pointer)));
-typedef int intgo; // Go's int
-typedef unsigned int uintgo; // Go's uint
+typedef intptr intgo; // Go's int
+typedef uintptr uintgo; // Go's uint
/* Defined types. */