diff options
author | Joshua M. Clulow <josh.clulow@joyent.com> | 2019-04-29 13:50:49 +0000 |
---|---|---|
committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-04-30 16:59:13 +0000 |
commit | f686a2890b34996455c7d7aba9a0efba74b613f5 (patch) | |
tree | d2f0348349a47f4697fb4dacdf687455cec4546a /src/runtime/mem_bsd.go | |
parent | 0c9e0c257b121acae72b9419be64ce45196ef825 (diff) | |
download | go-f686a2890b34996455c7d7aba9a0efba74b613f5.tar.gz go-f686a2890b34996455c7d7aba9a0efba74b613f5.zip |
all: add new GOOS=illumos, split out of GOOS=solaris
Like GOOS=android which implies the "linux" build tag, GOOS=illumos
implies the "solaris" build tag. This lets the existing ecosystem of
packages still work on illumos, but still permits packages to start
differentiating between solaris and illumos.
Fixes #20603
Change-Id: I8f4eabf1a66060538dca15d7658c1fbc6c826622
Reviewed-on: https://go-review.googlesource.com/c/go/+/174457
Run-TryBot: Benny Siegert <bsiegert@gmail.com>
Reviewed-by: Benny Siegert <bsiegert@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/runtime/mem_bsd.go')
-rw-r--r-- | src/runtime/mem_bsd.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/mem_bsd.go b/src/runtime/mem_bsd.go index cc70e806ea..3977e4ae9e 100644 --- a/src/runtime/mem_bsd.go +++ b/src/runtime/mem_bsd.go @@ -56,7 +56,7 @@ func sysMap(v unsafe.Pointer, n uintptr, sysStat *uint64) { mSysStatInc(sysStat, n) p, err := mmap(v, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_FIXED|_MAP_PRIVATE, -1, 0) - if err == _ENOMEM || (GOOS == "solaris" && err == _sunosEAGAIN) { + if err == _ENOMEM || ((GOOS == "solaris" || GOOS == "illumos") && err == _sunosEAGAIN) { throw("runtime: out of memory") } if p != v || err != 0 { |