3 files changed, 6 insertions, 6 deletions
diff --git a/libgo/runtime/go-map-delete.c b/libgo/runtime/go-map-delete.c
index ec851e531d2..7a3a7b83d92 100644
--- a/libgo/runtime/go-map-delete.c
+++ b/libgo/runtime/go-map-delete.c
@@ -18,7 +18,7 @@ __go_map_delete (struct __go_map *map, const void *key)
 {
   const struct __go_map_descriptor *descriptor;
   const struct __go_type_descriptor *key_descriptor;
-  size_t key_offset;
+  uintptr_t key_offset;
   _Bool (*equalfn) (const void*, const void*, size_t);
   size_t key_hash;
   size_t key_size;
diff --git a/libgo/runtime/go-map-index.c b/libgo/runtime/go-map-index.c
index 02a0f73f224..a387c4b98bc 100644
--- a/libgo/runtime/go-map-index.c
+++ b/libgo/runtime/go-map-index.c
@@ -18,7 +18,7 @@ __go_map_rehash (struct __go_map *map)
 {
   const struct __go_map_descriptor *descriptor;
   const struct __go_type_descriptor *key_descriptor;
-  size_t key_offset;
+  uintptr_t key_offset;
   size_t key_size;
   size_t (*hashfn) (const void *, size_t);
   uintptr_t old_bucket_count;
@@ -78,7 +78,7 @@ __go_map_index (struct __go_map *map, const void *key, _Bool insert)
 {
   const struct __go_map_descriptor *descriptor;
   const struct __go_type_descriptor *key_descriptor;
-  size_t key_offset;
+  uintptr_t key_offset;
   _Bool (*equalfn) (const void*, const void*, size_t);
   size_t key_hash;
   size_t key_size;
diff --git a/libgo/runtime/map.h b/libgo/runtime/map.h
index 40c31f82315..0c587bb2afa 100644
--- a/libgo/runtime/map.h
+++ b/libgo/runtime/map.h
@@ -22,15 +22,15 @@ struct __go_map_descriptor
        key_type key;
        value_type value;
      This is the size of that struct.  */
-  size_t __entry_size;
+  uintptr_t __entry_size;
 
   /* The offset of the key field in a map entry struct.  */
-  size_t __key_offset;
+  uintptr_t __key_offset;
 
   /* The offset of the value field in a map entry struct (the value
      field immediately follows the key field, but there may be some
      bytes inserted for alignment).  */
-  size_t __val_offset;
+  uintptr_t __val_offset;
 };
 
 struct __go_map