diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-21 10:22:18 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-21 10:22:18 -0500 |
| commit | ecbbc98fca8ef53f6b63083a00372b0a5f38f420 (patch) | |
| tree | ab890c8acde273e8659efdfbb6750df152392c05 /src/runtime/mem_bsd.go | |
| parent | 0367e0ec7b0d852e5f45a06f17f808d7360e3450 (diff) | |
| download | go-ecbbc98fca8ef53f6b63083a00372b0a5f38f420.tar.gz | |
[dev.cc] runtime: convert nacl support to Go
LGTM=dave
R=minux, dave
CC=golang-codereviews
https://codereview.appspot.com/181030043
Diffstat (limited to 'src/runtime/mem_bsd.go')
| -rw-r--r-- | src/runtime/mem_bsd.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/mem_bsd.go b/src/runtime/mem_bsd.go index 4bd40a39f..e9be5ec8c 100644 --- a/src/runtime/mem_bsd.go +++ b/src/runtime/mem_bsd.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build dragonfly freebsd netbsd openbsd solaris +// +build dragonfly freebsd nacl netbsd openbsd solaris package runtime @@ -38,7 +38,7 @@ func sysReserve(v unsafe.Pointer, n uintptr, reserved *bool) unsafe.Pointer { // On 64-bit, people with ulimit -v set complain if we reserve too // much address space. Instead, assume that the reservation is okay // and check the assumption in SysMap. - if ptrSize == 8 && uint64(n) > 1<<32 { + if ptrSize == 8 && uint64(n) > 1<<32 || goos_nacl != 0 { *reserved = false return v } |