vendor, cmd/vendor: update vendored x/sys and x/net

Pick up GOOS=ios changes.

This is done by

cd $GOROOT/src
go get -d golang.org/x/net@latest
go mod tidy
go mod vendor
go get -d golang.org/x/sys@latest
go mod tidy
go mod vendor
cd $GOROOT/src/cmd
go get -d golang.org/x/sys@latest
go mod tidy
go mod vendor

Updates #38485.

Change-Id: Ic2b54febb1f851814c9d76c4b55a8837ac4779f8
Reviewed-on: https://go-review.googlesource.com/c/go/+/257618
Trust: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>

diff --git a/src/cmd/go.mod b/src/cmd/go.mod
index c228b04b42f8cdf89542be330011ad0c28958cb1..59d6152e2a01d9a39644f3c53738f2a26717f6e0 100644 (file)
--- a/src/cmd/go.mod
+++ b/src/cmd/go.mod
@@ -8,6 +8,6 @@ require (
        golang.org/x/arch v0.0.0-20200826200359-b19915210f00
        golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
        golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449
-       golang.org/x/sys v0.0.0-20200918174421-af09f7315aff // indirect
+       golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d // indirect
        golang.org/x/tools v0.0.0-20200918232735-d647fc253266
 )

diff --git a/src/cmd/go.sum b/src/cmd/go.sum
index d41f36e1478a25f73a9f0f3ab55af4a63632c989..1b6d680d62339c50b070ce4ba1db8a80748994ec 100644 (file)
--- a/src/cmd/go.sum
+++ b/src/cmd/go.sum
@@ -26,8 +26,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200918174421-af09f7315aff h1:1CPUrky56AcgSpxz/KfgzQWzfG09u5YOL8MvPYBlrL8=
-golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d h1:L/IKR6COd7ubZrs2oTnTi73IhgqJ71c9s80WsQnh0Es=
+golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200918232735-d647fc253266 h1:k7tVuG0g1JwmD3Jh8oAl1vQ1C3jb4Hi/dUl1wWDBJpQ=

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/mkerrors.sh b/src/cmd/vendor/golang.org/x/sys/unix/mkerrors.sh
index e7c51aa409734213f4cff33ed6092c0640a38f7a..1bef7148d2a20eb3af8ad7977fc669cf22012ab1 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/mkerrors.sh
+++ b/src/cmd/vendor/golang.org/x/sys/unix/mkerrors.sh
@@ -517,6 +517,7 @@ ccflags="$@"
                $2 ~ /^CP_/ ||
                $2 ~ /^CPUSTATES$/ ||
                $2 ~ /^ALG_/ ||
+               $2 ~ /^FI(CLONE|DEDUPERANGE)/ ||
                $2 ~ /^FS_(POLICY_FLAGS|KEY_DESC|ENCRYPTION_MODE|[A-Z0-9_]+_KEY_SIZE)/ ||
                $2 ~ /^FS_IOC_.*(ENCRYPTION|VERITY|[GS]ETFLAGS)/ ||
                $2 ~ /^FS_VERITY_/ ||

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go b/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
index 7d08dae5baf3fe4569d56a721a91e624e06b978d..abdedcf1d56de9d1e96c1cf86a4fbae69715aec3 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
@@ -20,7 +20,7 @@ func cmsgAlignOf(salen int) int {
        case "aix":
                // There is no alignment on AIX.
                salign = 1
-       case "darwin", "illumos", "solaris":
+       case "darwin", "ios", "illumos", "solaris":
                // NOTE: It seems like 64-bit Darwin, Illumos and Solaris
                // kernels still require 32-bit aligned access to network
                // subsystem.

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/syscall_bsd.go b/src/cmd/vendor/golang.org/x/sys/unix/syscall_bsd.go
index 60bbe10adf7369a0550c706134febf27a621c284..9ebe92e4da60e80d5bf6b4f911cf16fa051eca13 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/syscall_bsd.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/syscall_bsd.go
@@ -272,7 +272,7 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) {
        if err != nil {
                return
        }
-       if runtime.GOOS == "darwin" && len == 0 {
+       if (runtime.GOOS == "darwin" || runtime.GOOS == "ios") && len == 0 {
                // Accepted socket has no address.
                // This is likely due to a bug in xnu kernels,
                // where instead of ECONNABORTED error socket

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/syscall_illumos.go b/src/cmd/vendor/golang.org/x/sys/unix/syscall_illumos.go
index 16e40091ce3ed39bfe024093f8d1faca63c84f89..bbc4f3ea543963fce397ea4c2a2e2149e950b9d4 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/syscall_illumos.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/syscall_illumos.go
@@ -56,7 +56,7 @@ func Pwritev(fd int, iovs [][]byte, off int64) (n int, err error) {
        return n, err
 }
 
-//sys  accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys  accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) = libsocket.accept4
 
 func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) {
        var rsa RawSockaddrAny

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/syscall_linux.go b/src/cmd/vendor/golang.org/x/sys/unix/syscall_linux.go
index ec7e4c4d361532952bfcac955eb538eb2f43a806..94dafa4e528b3e6d2c5fe3650c12ec068ce27251 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -112,6 +112,31 @@ func IoctlGetRTCWkAlrm(fd int) (*RTCWkAlrm, error) {
        return &value, err
 }
 
+// IoctlFileClone performs an FICLONERANGE ioctl operation to clone the range of
+// data conveyed in value to the file associated with the file descriptor
+// destFd. See the ioctl_ficlonerange(2) man page for details.
+func IoctlFileCloneRange(destFd int, value *FileCloneRange) error {
+       err := ioctl(destFd, FICLONERANGE, uintptr(unsafe.Pointer(value)))
+       runtime.KeepAlive(value)
+       return err
+}
+
+// IoctlFileClone performs an FICLONE ioctl operation to clone the entire file
+// associated with the file description srcFd to the file associated with the
+// file descriptor destFd. See the ioctl_ficlone(2) man page for details.
+func IoctlFileClone(destFd, srcFd int) error {
+       return ioctl(destFd, FICLONE, uintptr(srcFd))
+}
+
+// IoctlFileClone performs an FIDEDUPERANGE ioctl operation to share the range of
+// data conveyed in value with the file associated with the file descriptor
+// destFd. See the ioctl_fideduperange(2) man page for details.
+func IoctlFileDedupeRange(destFd int, value *FileDedupeRange) error {
+       err := ioctl(destFd, FIDEDUPERANGE, uintptr(unsafe.Pointer(value)))
+       runtime.KeepAlive(value)
+       return err
+}
+
 //sys  Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error)
 
 func Link(oldpath string, newpath string) (err error) {

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux.go
index 388050a0f66ff7def059eec12d9fc8f2278e9f29..79e032f4fb7e72dd6f9504974ba3fc831c7668c7 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux.go
@@ -686,6 +686,7 @@ const (
        FD_CLOEXEC                                  = 0x1
        FD_SETSIZE                                  = 0x400
        FF0                                         = 0x0
+       FIDEDUPERANGE                               = 0xc0189436
        FSCRYPT_KEY_DESCRIPTOR_SIZE                 = 0x8
        FSCRYPT_KEY_DESC_PREFIX                     = "fscrypt:"
        FSCRYPT_KEY_DESC_PREFIX_SIZE                = 0x8

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
index 11b25f68c26a85d18a5c8fea7f6f5f012bd9ea0a..dd282c08b7f11fa7dfb921aa29261969c6dbed0f 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -71,6 +71,8 @@ const (
        EXTPROC                          = 0x10000
        FF1                              = 0x8000
        FFDLY                            = 0x8000
+       FICLONE                          = 0x40049409
+       FICLONERANGE                     = 0x4020940d
        FLUSHO                           = 0x1000
        FP_XSTATE_MAGIC2                 = 0x46505845
        FS_IOC_ENABLE_VERITY             = 0x40806685

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
index f92cff6ea0d2bcb4082fa7478cba4836b85bfbea..82fc93c7bbc128f03b1fc1f05b9063eb43754cb0 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -71,6 +71,8 @@ const (
        EXTPROC                          = 0x10000
        FF1                              = 0x8000
        FFDLY                            = 0x8000
+       FICLONE                          = 0x40049409
+       FICLONERANGE                     = 0x4020940d
        FLUSHO                           = 0x1000
        FP_XSTATE_MAGIC2                 = 0x46505845
        FS_IOC_ENABLE_VERITY             = 0x40806685

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
index 12bcbf88d69fe2b588ba3d02d6d063a2390ec469..fe7094f2763f986ae2ed38d537afadea81a40844 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -71,6 +71,8 @@ const (
        EXTPROC                          = 0x10000
        FF1                              = 0x8000
        FFDLY                            = 0x8000
+       FICLONE                          = 0x40049409
+       FICLONERANGE                     = 0x4020940d
        FLUSHO                           = 0x1000
        FS_IOC_ENABLE_VERITY             = 0x40806685
        FS_IOC_GETFLAGS                  = 0x80046601

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
index 84f71e99fea0c405f4f47296fb23200e7be57887..3b6cc58803b6e0cb21d8ab44a8b8a0ebc05733c8 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -73,6 +73,8 @@ const (
        EXTRA_MAGIC                      = 0x45585401
        FF1                              = 0x8000
        FFDLY                            = 0x8000
+       FICLONE                          = 0x40049409
+       FICLONERANGE                     = 0x4020940d
        FLUSHO                           = 0x1000
        FPSIMD_MAGIC                     = 0x46508001
        FS_IOC_ENABLE_VERITY             = 0x40806685

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
index eeadea943f3cd02374d5184633b28a5fc1219a85..ce3d9ae15610c64bdd7f13f7cf2119092913dfc9 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
@@ -71,6 +71,8 @@ const (
        EXTPROC                          = 0x10000
        FF1                              = 0x8000
        FFDLY                            = 0x8000
+       FICLONE                          = 0x80049409
+       FICLONERANGE                     = 0x8020940d
        FLUSHO                           = 0x2000
        FS_IOC_ENABLE_VERITY             = 0x80806685
        FS_IOC_GETFLAGS                  = 0x40046601

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
index 0be6c4ccc0e698c2a2b74afa77de4b431ec6f3f4..7a85215ce5231e73e7b95e8817a3143b0bb385e0 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -71,6 +71,8 @@ const (
        EXTPROC                          = 0x10000
        FF1                              = 0x8000
        FFDLY                            = 0x8000
+       FICLONE                          = 0x80049409
+       FICLONERANGE                     = 0x8020940d
        FLUSHO                           = 0x2000
        FS_IOC_ENABLE_VERITY             = 0x80806685
        FS_IOC_GETFLAGS                  = 0x40086601

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
index 0880b745c109d8fcda0976725fbc1cf8ba908228..07d4cc1bd5ff43ecd636563cb739ab7cd1159778 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -71,6 +71,8 @@ const (
        EXTPROC                          = 0x10000
        FF1                              = 0x8000
        FFDLY                            = 0x8000
+       FICLONE                          = 0x80049409
+       FICLONERANGE                     = 0x8020940d
        FLUSHO                           = 0x2000
        FS_IOC_ENABLE_VERITY             = 0x80806685
        FS_IOC_GETFLAGS                  = 0x40086601

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
index c8a66627aa4db3c500127b806bd4b931e2b2f4a3..d4842ba1c2a816faadfe63d28310ed8065ebec4a 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
@@ -71,6 +71,8 @@ const (
        EXTPROC                          = 0x10000
        FF1                              = 0x8000
        FFDLY                            = 0x8000
+       FICLONE                          = 0x80049409
+       FICLONERANGE                     = 0x8020940d
        FLUSHO                           = 0x2000
        FS_IOC_ENABLE_VERITY             = 0x80806685
        FS_IOC_GETFLAGS                  = 0x40046601

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
index 97aae63f16cb519dd5596fd75170d92e2c974d3e..941e20daceca0a45616443d1efbf912e7d57d3e3 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -71,6 +71,8 @@ const (
        EXTPROC                          = 0x10000000
        FF1                              = 0x4000
        FFDLY                            = 0x4000
+       FICLONE                          = 0x80049409
+       FICLONERANGE                     = 0x8020940d
        FLUSHO                           = 0x800000
        FS_IOC_ENABLE_VERITY             = 0x80806685
        FS_IOC_GETFLAGS                  = 0x40086601

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
index b0c3b0664f4e3a85af181f39e62fa51a25db3c1a..63d3bc56627d2f30118a3979c8eaecfbc73f7657 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -71,6 +71,8 @@ const (
        EXTPROC                          = 0x10000000
        FF1                              = 0x4000
        FFDLY                            = 0x4000
+       FICLONE                          = 0x80049409
+       FICLONERANGE                     = 0x8020940d
        FLUSHO                           = 0x800000
        FS_IOC_ENABLE_VERITY             = 0x80806685
        FS_IOC_GETFLAGS                  = 0x40086601

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
index 0c0518193555b5f9ceda5c88aab52d0b1628e534..490bee1ab1b5531a773c18127f64e8d6a7939e1b 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
@@ -71,6 +71,8 @@ const (
        EXTPROC                          = 0x10000
        FF1                              = 0x8000
        FFDLY                            = 0x8000
+       FICLONE                          = 0x40049409
+       FICLONERANGE                     = 0x4020940d
        FLUSHO                           = 0x1000
        FS_IOC_ENABLE_VERITY             = 0x40806685
        FS_IOC_GETFLAGS                  = 0x80086601

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
index 0b96bd462e932a523a5db2aa646d3bc836cb0d2e..467b8218e80e650e8277d6fa535475111a7a4e8f 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -71,6 +71,8 @@ const (
        EXTPROC                          = 0x10000
        FF1                              = 0x8000
        FFDLY                            = 0x8000
+       FICLONE                          = 0x40049409
+       FICLONERANGE                     = 0x4020940d
        FLUSHO                           = 0x1000
        FS_IOC_ENABLE_VERITY             = 0x40806685
        FS_IOC_GETFLAGS                  = 0x80086601

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
index bd5c3057796d95298903c77ac61f5767a3a0ed7c..79fbafbcf6c47c0ccaef780646d5e067b05e40da 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
@@ -75,6 +75,8 @@ const (
        EXTPROC                          = 0x10000
        FF1                              = 0x8000
        FFDLY                            = 0x8000
+       FICLONE                          = 0x80049409
+       FICLONERANGE                     = 0x8020940d
        FLUSHO                           = 0x1000
        FS_IOC_ENABLE_VERITY             = 0x80806685
        FS_IOC_GETFLAGS                  = 0x40086601

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go b/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
index 8b329c45899f95aa72d80fb853bcbc6e1ebd0b96..d3af083f4e7cdc45f49985995c02fe77626d041f 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
@@ -13,7 +13,7 @@ import (
 //go:cgo_import_dynamic libc_preadv preadv "libc.so"
 //go:cgo_import_dynamic libc_writev writev "libc.so"
 //go:cgo_import_dynamic libc_pwritev pwritev "libc.so"
-//go:cgo_import_dynamic libc_accept4 accept4 "libc.so"
+//go:cgo_import_dynamic libc_accept4 accept4 "libsocket.so"
 //go:cgo_import_dynamic libc_pipe2 pipe2 "libc.so"
 
 //go:linkname procreadv libc_readv

diff --git a/src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux.go b/src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux.go
index 68e4974a9afc382c42ed7743a5e2e555fc710143..a92a5019afa822cf1e75c694cc3fb32705c2c046 100644 (file)
--- a/src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux.go
@@ -76,6 +76,21 @@ type Fsid struct {
        Val [2]int32
 }
 
+type FileCloneRange struct {
+       Src_fd      int64
+       Src_offset  uint64
+       Src_length  uint64
+       Dest_offset uint64
+}
+
+type FileDedupeRange struct {
+       Src_offset uint64
+       Src_length uint64
+       Dest_count uint16
+       Reserved1  uint16
+       Reserved2  uint32
+}
+
 type FscryptPolicy struct {
        Version                   uint8
        Contents_encryption_mode  uint8

diff --git a/src/cmd/vendor/modules.txt b/src/cmd/vendor/modules.txt
index 648296259376fc39036c3e80bb5f1467d9748428..21326f7521270c5b917d47060a0247913f34322d 100644 (file)
--- a/src/cmd/vendor/modules.txt
+++ b/src/cmd/vendor/modules.txt
@@ -40,7 +40,7 @@ golang.org/x/mod/sumdb/dirhash
 golang.org/x/mod/sumdb/note
 golang.org/x/mod/sumdb/tlog
 golang.org/x/mod/zip
-# golang.org/x/sys v0.0.0-20200918174421-af09f7315aff
+# golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d
 ## explicit
 golang.org/x/sys/internal/unsafeheader
 golang.org/x/sys/unix

diff --git a/src/go.mod b/src/go.mod
index b7de1ff5a441bd12f80b0ba0e0b212fc16bcf681..86e3c8c5b77a6d928734f361584a8424dfe4cc70 100644 (file)
--- a/src/go.mod
+++ b/src/go.mod
@@ -4,7 +4,7 @@ go 1.16
 
 require (
        golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
-       golang.org/x/net v0.0.0-20200904194848-62affa334b73
-       golang.org/x/sys v0.0.0-20200918174421-af09f7315aff // indirect
+       golang.org/x/net v0.0.0-20200925080053-05aa5d4ee321
+       golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d // indirect
        golang.org/x/text v0.3.4-0.20200826142016-a8b467125457 // indirect
 )

diff --git a/src/go.sum b/src/go.sum
index 305c856f643f3acb5827dff31c70e579928cb648..86a8c4be2a83eb62af686739b0ce8a4c9b584cf8 100644 (file)
--- a/src/go.sum
+++ b/src/go.sum
@@ -3,13 +3,13 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA=
-golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200925080053-05aa5d4ee321 h1:lleNcKRbcaC8MqgLwghIkzZ2JBQAb7QQ9MiwRt1BisA=
+golang.org/x/net v0.0.0-20200925080053-05aa5d4ee321/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200918174421-af09f7315aff h1:1CPUrky56AcgSpxz/KfgzQWzfG09u5YOL8MvPYBlrL8=
-golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d h1:L/IKR6COd7ubZrs2oTnTi73IhgqJ71c9s80WsQnh0Es=
+golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.4-0.20200826142016-a8b467125457 h1:K2Vq+FTHFbV5auJiAahir8LO9HUqufuVbQYSNzZopos=
 golang.org/x/text v0.3.4-0.20200826142016-a8b467125457/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

diff --git a/src/vendor/golang.org/x/net/nettest/nettest.go b/src/vendor/golang.org/x/net/nettest/nettest.go
index a402a46bb3308a0ae27f296db06d1432346f9cb5..953562f769ee65ab29208fed03f9f156174341c2 100644 (file)
--- a/src/vendor/golang.org/x/net/nettest/nettest.go
+++ b/src/vendor/golang.org/x/net/nettest/nettest.go
@@ -97,7 +97,7 @@ func TestableNetwork(network string) bool {
                switch runtime.GOOS {
                case "android", "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
                        return false
-               case "darwin":
+               case "darwin", "ios":
                        // iOS doesn't support it.
                        if runtime.GOARCH == "arm" || runtime.GOARCH == "arm64" {
                                return false
@@ -118,7 +118,7 @@ func TestableNetwork(network string) bool {
                        return false
                case "aix":
                        return unixStrmDgramEnabled()
-               case "darwin":
+               case "darwin", "ios":
                        // iOS does not support unix, unixgram.
                        if runtime.GOARCH == "arm" || runtime.GOARCH == "arm64" {
                                return false
@@ -126,7 +126,7 @@ func TestableNetwork(network string) bool {
                }
        case "unixpacket":
                switch runtime.GOOS {
-               case "aix", "android", "fuchsia", "hurd", "darwin", "js", "nacl", "plan9", "windows":
+               case "aix", "android", "fuchsia", "hurd", "darwin", "ios", "js", "nacl", "plan9", "windows":
                        return false
                case "netbsd":
                        // It passes on amd64 at least. 386 fails

diff --git a/src/vendor/golang.org/x/net/route/address.go b/src/vendor/golang.org/x/net/route/address.go
index e3125a473bc0d1009b0d81ecfdcbb009e414d9da..3c2fe15a970098c4f9f2ce4de37bc9536e40ff41 100644 (file)
--- a/src/vendor/golang.org/x/net/route/address.go
+++ b/src/vendor/golang.org/x/net/route/address.go
@@ -221,7 +221,7 @@ func parseKernelInetAddr(af int, b []byte) (int, Addr, error) {
        //   to make the <length, prefix> tuple to be conformed with
        //   the routing message boundary
        l := int(b[0])
-       if runtime.GOOS == "darwin" {
+       if runtime.GOOS == "darwin" || runtime.GOOS == "ios" {
                // On Darwin, an address in the kernel form is also
                // used as a message filler.
                if l == 0 || len(b) > roundup(l) {

diff --git a/src/vendor/golang.org/x/net/route/route_classic.go b/src/vendor/golang.org/x/net/route/route_classic.go
index a7d3864646b7c9c2cf92b246a765a1370b989edd..b83add668e7db46cc1349449af9dcceff2b14635 100644 (file)
--- a/src/vendor/golang.org/x/net/route/route_classic.go
+++ b/src/vendor/golang.org/x/net/route/route_classic.go
@@ -17,7 +17,7 @@ func (m *RouteMessage) marshal() ([]byte, error) {
                return nil, errUnsupportedMessage
        }
        l := w.bodyOff + addrsSpace(m.Addrs)
-       if runtime.GOOS == "darwin" {
+       if runtime.GOOS == "darwin" || runtime.GOOS == "ios" {
                // Fix stray pointer writes on macOS.
                // See golang.org/issue/22456.
                l += 1024

diff --git a/src/vendor/golang.org/x/net/route/syscall_go1_11_darwin.go b/src/vendor/golang.org/x/net/route/syscall_go1_11_darwin.go
deleted file mode 100644 (file)
index 7228e44..0000000
--- a/src/vendor/golang.org/x/net/route/syscall_go1_11_darwin.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.12
-
-package route
-
-import (
-       "syscall"
-       "unsafe"
-)
-
-var zero uintptr
-
-func sysctl(mib []int32, old *byte, oldlen *uintptr, new *byte, newlen uintptr) error {
-       var p unsafe.Pointer
-       if len(mib) > 0 {
-               p = unsafe.Pointer(&mib[0])
-       } else {
-               p = unsafe.Pointer(&zero)
-       }
-       _, _, errno := syscall.Syscall6(syscall.SYS___SYSCTL, uintptr(p), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), newlen)
-       if errno != 0 {
-               return error(errno)
-       }
-       return nil
-}

diff --git a/src/vendor/golang.org/x/sys/cpu/cpu_arm64.go b/src/vendor/golang.org/x/sys/cpu/cpu_arm64.go
index 2d90024387f5a930a5d074a1d81472b8d82bdfe3..951078f2e82e25bed31260e2b106a49319821707 100644 (file)
--- a/src/vendor/golang.org/x/sys/cpu/cpu_arm64.go
+++ b/src/vendor/golang.org/x/sys/cpu/cpu_arm64.go
@@ -39,7 +39,7 @@ func initOptions() {
 
 func archInit() {
        switch runtime.GOOS {
-       case "android", "darwin", "netbsd":
+       case "android", "darwin", "ios", "netbsd":
                // Android and iOS don't seem to allow reading these registers.
                //
                // NetBSD:

diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
index 46f82829f09b73ab57243b1eb43f77133059b49e..d53b647310499975e5b67d1bc7196b4522e0d0aa 100644 (file)
--- a/src/vendor/modules.txt
+++ b/src/vendor/modules.txt
@@ -8,7 +8,7 @@ golang.org/x/crypto/curve25519
 golang.org/x/crypto/hkdf
 golang.org/x/crypto/internal/subtle
 golang.org/x/crypto/poly1305
-# golang.org/x/net v0.0.0-20200904194848-62affa334b73
+# golang.org/x/net v0.0.0-20200925080053-05aa5d4ee321
 ## explicit
 golang.org/x/net/dns/dnsmessage
 golang.org/x/net/http/httpguts
@@ -18,7 +18,7 @@ golang.org/x/net/idna
 golang.org/x/net/lif
 golang.org/x/net/nettest
 golang.org/x/net/route
-# golang.org/x/sys v0.0.0-20200918174421-af09f7315aff
+# golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d
 ## explicit
 golang.org/x/sys/cpu
 # golang.org/x/text v0.3.4-0.20200826142016-a8b467125457