From: Tobias Klauser <tklauser@distanz.ch>
Date: Mon, 15 Aug 2022 08:52:48 +0000 (+0200)
Subject: cmd/go/internal/mmap: use syscall.Mmap on solaris
X-Git-Tag: go1.20rc1~1621
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b565476e2c812f65385595717fff191ac174cab7;p=gostls13.git

cmd/go/internal/mmap: use syscall.Mmap on solaris

Now that syscall.Mmap is defined on solaris (see CL 413374), use it in
mmapFile like on other Unix ports.

For #52875

Change-Id: Ic5c5a84da8613f0c6dc947a52b7fcca50af43d79
Reviewed-on: https://go-review.googlesource.com/c/go/+/413375
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
---

diff --git a/src/cmd/go/internal/mmap/mmap_other.go b/src/cmd/go/internal/mmap/mmap_plan9.go
similarity index 93%
rename from src/cmd/go/internal/mmap/mmap_other.go
rename to src/cmd/go/internal/mmap/mmap_plan9.go
index 269fe8d60a..faa5d5fc66 100644
--- a/src/cmd/go/internal/mmap/mmap_other.go
+++ b/src/cmd/go/internal/mmap/mmap_plan9.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build plan9 || solaris
-
 package mmap
 
 import (
diff --git a/src/cmd/go/internal/mmap/mmap_unix.go b/src/cmd/go/internal/mmap/mmap_unix.go
index 33e839c217..53bcbb92a8 100644
--- a/src/cmd/go/internal/mmap/mmap_unix.go
+++ b/src/cmd/go/internal/mmap/mmap_unix.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.
 
-//go:build unix && !solaris
+//go:build unix
 
 package mmap