aboutsummaryrefslogtreecommitdiff
path: root/src/pkg
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-02-26 12:21:31 -0500
committerRuss Cox <rsc@golang.org>2014-02-26 12:21:31 -0500
commite8fe1cce66f51e7fa12a1b37dd273bbcd10176a8 (patch)
treed4881b4695869f8e27fae54cffcdef0905ed432e /src/pkg
parentdeaf89b8f1b62239cacfc9102b6ef27fb9a52951 (diff)
downloadgo-e8fe1cce66f51e7fa12a1b37dd273bbcd10176a8.tar.xz
runtime, net: fixes from CL 68490043 review
These are mistakes in the first big NaCl CL. LGTM=minux.ma, iant R=golang-codereviews, minux.ma, iant CC=golang-codereviews https://golang.org/cl/69200043
Diffstat (limited to 'src/pkg')
-rw-r--r--src/pkg/runtime/arch_amd64.h4
-rw-r--r--src/pkg/runtime/arch_amd64p32.h4
-rw-r--r--src/pkg/runtime/runtime.h2
3 files changed, 2 insertions, 8 deletions
diff --git a/src/pkg/runtime/arch_amd64.h b/src/pkg/runtime/arch_amd64.h
index 88b68cc6df..060c4d4f53 100644
--- a/src/pkg/runtime/arch_amd64.h
+++ b/src/pkg/runtime/arch_amd64.h
@@ -11,10 +11,6 @@ enum {
#else
RuntimeGogoBytes = 64,
#endif
-#ifdef GOOS_nacl
- PhysPageSize = 65536,
-#else
PhysPageSize = 4096,
-#endif
PCQuantum = 1
};
diff --git a/src/pkg/runtime/arch_amd64p32.h b/src/pkg/runtime/arch_amd64p32.h
index 88b68cc6df..073a9e30e1 100644
--- a/src/pkg/runtime/arch_amd64p32.h
+++ b/src/pkg/runtime/arch_amd64p32.h
@@ -6,11 +6,7 @@ enum {
thechar = '6',
BigEndian = 0,
CacheLineSize = 64,
-#ifdef GOOS_solaris
- RuntimeGogoBytes = 80,
-#else
RuntimeGogoBytes = 64,
-#endif
#ifdef GOOS_nacl
PhysPageSize = 65536,
#else
diff --git a/src/pkg/runtime/runtime.h b/src/pkg/runtime/runtime.h
index 0069d5a774..e040c18272 100644
--- a/src/pkg/runtime/runtime.h
+++ b/src/pkg/runtime/runtime.h
@@ -795,6 +795,8 @@ int32 runtime·charntorune(int32*, uint8*, int32);
* first output value. Almost all code should write such
* functions in .goc files, where goc2c (part of cmd/dist)
* can arrange the correct alignment for the target system.
+ * Goc2c also takes care of conveying to the garbage collector
+ * which parts of the argument list are inputs vs outputs.
*
* Therefore, do NOT use this macro if at all possible.
*/