From: Giles Lean <giles.lean@pobox.com>
Date: Mon, 3 May 2010 08:26:39 +0000 (-0700)
Subject: runtime: update godefs usage comment for GOARCH=386 GOOS={darwin,freebsd}
X-Git-Tag: weekly.2010-05-04~19
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3c32300c4dcd50143e5aa6089c583e068c331099;p=gostls13.git

runtime: update godefs usage comment for GOARCH=386 GOOS={darwin,freebsd}

When trying to regenerate src/pkg/runtime/darwin/386/defs.h
on a 64 bit capable Snow Leopard (OS X 10.6.3) system I
needed to add -f -m32 to godefs, as this OS and hardware
combination defaults to 64 bit compilation.

For safety, make the same change to the 32 bit FreeBSD
instructions in .../freebsd/defs.c.  (Tested OK and no
problems introduced.)

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/1052042
---

diff --git a/src/pkg/runtime/darwin/386/defs.h b/src/pkg/runtime/darwin/386/defs.h
index 69ccc35f7d..371f650a87 100644
--- a/src/pkg/runtime/darwin/386/defs.h
+++ b/src/pkg/runtime/darwin/386/defs.h
@@ -1,4 +1,4 @@
-// godefs defs.c
+// godefs -f -m32 defs.c
 
 // MACHINE GENERATED - DO NOT EDIT.
 
diff --git a/src/pkg/runtime/darwin/defs.c b/src/pkg/runtime/darwin/defs.c
index 95edf7bb10..8735e78572 100644
--- a/src/pkg/runtime/darwin/defs.c
+++ b/src/pkg/runtime/darwin/defs.c
@@ -6,7 +6,7 @@
  * Input to godefs.
  *
 	godefs -f -m64 defs.c >amd64/defs.h
-	godefs defs.c >386/defs.h
+	godefs -f -m32 defs.c >386/defs.h
  */
 
 #define __DARWIN_UNIX03 0
diff --git a/src/pkg/runtime/freebsd/386/defs.h b/src/pkg/runtime/freebsd/386/defs.h
index 69b8661eb0..76c55721f6 100644
--- a/src/pkg/runtime/freebsd/386/defs.h
+++ b/src/pkg/runtime/freebsd/386/defs.h
@@ -1,4 +1,4 @@
-// godefs defs.c
+// godefs -f -m32 defs.c
 
 // MACHINE GENERATED - DO NOT EDIT.
 
diff --git a/src/pkg/runtime/freebsd/defs.c b/src/pkg/runtime/freebsd/defs.c
index 0c75e75c4c..36e69093e4 100644
--- a/src/pkg/runtime/freebsd/defs.c
+++ b/src/pkg/runtime/freebsd/defs.c
@@ -6,7 +6,7 @@
  * Input to godefs.
  *
 	godefs -f -m64 defs.c >amd64/defs.h
-	godefs defs.c >386/defs.h
+	godefs -f -m32 defs.c >386/defs.h
  */
 
 #include <sys/types.h>