code review 5645093: cmd/dist: cross-compiling fixes

src/cmd/dist/goc2c.c

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 #include "a.h"
 
 /*
  * Translate a .goc file into a .c file.  A .goc file is a combination
  * of a limited form of Go with C.
  */
@@ skipping 691 matching lines @@
         Buf in, out;
 ········
         binit(&in);
         binit(&out);
 ········
         file = goc;
         readfile(&in, goc);
 
         // TODO: set gcc=1 when using gcc
 
-        if(!gcc && streq(goarch, "amd64")) {
-                type_table[Uintptr].size = 8;
-                type_table[String].size = 16;
-                type_table[Slice].size = 8+4+4;
-                type_table[Eface].size = 8+8;
-                structround = 8;
-        }
-
-        bprintf(&out, "// auto generated by go tool dist\n\n");
+        if(!gcc) {
+                if(streq(goarch, "amd64")) {
+                        type_table[Uintptr].size = 8;
+                        type_table[String].size = 16;
+                        type_table[Slice].size = 8+4+4;
+                        type_table[Eface].size = 8+8;
+                        structround = 8;
+                } else {
+                        type_table[Uintptr].size = 4;
+                        type_table[String].size = 8;
+                        type_table[Slice].size = 16;
+                        type_table[Eface].size = 4+4;
+                        structround = 4;
+                }
+        }
+
+        bprintf(&out, "// auto generated by go tool dist\n// goos=%s goarch=%s\n\n", goos, goarch);
         input = bstr(&in);
         output = &out;
 
         process_file();
 ········
         writefile(&out, c);
 }