diff options
author | Brad Fitzpatrick <bradfitz@golang.org> | 2020-04-30 22:35:29 -0700 |
---|---|---|
committer | Brad Fitzpatrick <bradfitz@golang.org> | 2020-05-01 18:00:18 +0000 |
commit | f00b8b45a24479836d8c148cf85fd97091290b05 (patch) | |
tree | 6d9ca7ccdf16efaef76d624f7e62ef1123a082e4 /src/vendor | |
parent | a81bc8e8254d01cd442a5684801d8d2dbc553694 (diff) | |
download | go-f00b8b45a24479836d8c148cf85fd97091290b05.tar.gz go-f00b8b45a24479836d8c148cf85fd97091290b05.zip |
cmd,std: update golang.org/x/net to 20200501053045-e0ff5e5a1de5
For latest http2 changes.
Which then required updating golang.org/x/sys in cmd too.
Change-Id: I3fac5f3a15f4c9381baaff597873ed0c6209dbac
Reviewed-on: https://go-review.googlesource.com/c/go/+/231457
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/vendor')
-rw-r--r-- | src/vendor/golang.org/x/net/http2/hpack/huffman.go | 7 | ||||
-rw-r--r-- | src/vendor/golang.org/x/net/route/route.go | 2 | ||||
-rw-r--r-- | src/vendor/golang.org/x/sys/cpu/cpu.go | 9 | ||||
-rw-r--r-- | src/vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go | 22 | ||||
-rw-r--r-- | src/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go | 2 | ||||
-rw-r--r-- | src/vendor/modules.txt | 5 |
6 files changed, 42 insertions, 5 deletions
diff --git a/src/vendor/golang.org/x/net/http2/hpack/huffman.go b/src/vendor/golang.org/x/net/http2/hpack/huffman.go index b412a96c50..a1ab2f0567 100644 --- a/src/vendor/golang.org/x/net/http2/hpack/huffman.go +++ b/src/vendor/golang.org/x/net/http2/hpack/huffman.go @@ -105,7 +105,14 @@ func huffmanDecode(buf *bytes.Buffer, maxLen int, v []byte) error { return nil } +// incomparable is a zero-width, non-comparable type. Adding it to a struct +// makes that struct also non-comparable, and generally doesn't add +// any size (as long as it's first). +type incomparable [0]func() + type node struct { + _ incomparable + // children is non-nil for internal nodes children *[256]*node diff --git a/src/vendor/golang.org/x/net/route/route.go b/src/vendor/golang.org/x/net/route/route.go index bba7ed7ef4..4462cf1b6f 100644 --- a/src/vendor/golang.org/x/net/route/route.go +++ b/src/vendor/golang.org/x/net/route/route.go @@ -88,7 +88,7 @@ func (m *RouteMessage) Marshal() ([]byte, error) { return m.marshal() } -// A RIBType reprensents a type of routing information base. +// A RIBType represents a type of routing information base. type RIBType int const ( diff --git a/src/vendor/golang.org/x/sys/cpu/cpu.go b/src/vendor/golang.org/x/sys/cpu/cpu.go index b4e6ecb2dc..e44deb7574 100644 --- a/src/vendor/golang.org/x/sys/cpu/cpu.go +++ b/src/vendor/golang.org/x/sys/cpu/cpu.go @@ -114,6 +114,15 @@ var ARM struct { _ CacheLinePad } +// MIPS64X contains the supported CPU features of the current mips64/mips64le +// platforms. If the current platform is not mips64/mips64le or the current +// operating system is not Linux then all feature flags are false. +var MIPS64X struct { + _ CacheLinePad + HasMSA bool // MIPS SIMD architecture + _ CacheLinePad +} + // PPC64 contains the supported CPU features of the current ppc64/ppc64le platforms. // If the current platform is not ppc64/ppc64le then all feature flags are false. // diff --git a/src/vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go b/src/vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go new file mode 100644 index 0000000000..eb24e5073e --- /dev/null +++ b/src/vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go @@ -0,0 +1,22 @@ +// Copyright 2020 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 mips64 mips64le + +package cpu + +// HWCAP bits. These are exposed by the Linux kernel 5.4. +const ( + // CPU features + hwcap_MIPS_MSA = 1 << 1 +) + +func doinit() { + // HWCAP feature bits + MIPS64X.HasMSA = isSet(hwCap, hwcap_MIPS_MSA) +} + +func isSet(hwc uint, value uint) bool { + return hwc&value != 0 +} diff --git a/src/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go b/src/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go index f65134f67f..42b5d33cb6 100644 --- a/src/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go +++ b/src/vendor/golang.org/x/sys/cpu/cpu_linux_noinit.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 linux,!arm,!arm64,!ppc64,!ppc64le,!s390x +// +build linux,!arm,!arm64,!mips64,!mips64le,!ppc64,!ppc64le,!s390x package cpu diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt index f269787204..37fda889ec 100644 --- 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-20200301022130-244492dfa37a +# golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 ## explicit golang.org/x/net/dns/dnsmessage golang.org/x/net/http/httpguts @@ -18,8 +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-20200219091948-cb0a6d8edb6c -## explicit +# golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd golang.org/x/sys/cpu # golang.org/x/text v0.3.3-0.20191031172631-4b67af870c6f ## explicit |