diff options
author | Bryan C. Mills <bcmills@google.com> | 2019-10-09 12:17:55 -0400 |
---|---|---|
committer | Bryan C. Mills <bcmills@google.com> | 2019-10-09 18:02:10 +0000 |
commit | dec07f3723067f59b932b8e9ec463edef4a8b547 (patch) | |
tree | 53f2aec526c55ec182218c9475e88c33cab4c7ee | |
parent | df92229d39361fedc53192dbd75da35955024d3a (diff) | |
download | go-dec07f3723067f59b932b8e9ec463edef4a8b547.tar.gz go-dec07f3723067f59b932b8e9ec463edef4a8b547.zip |
[release-branch.go1.12] cmd/vendor/golang.org/x/arch/arm64/arm64asm: recognise new ssbb/pssbb mnemonics from objdump
This patches in CL 136455 from the 'arch' repo.
Commands run:
~/go/src/cmd$ GOPATH=$(../../bin/go env GOROOT) govendor fetch golang.org/x/arch/arm64/arm64asm@b19384d3c130858bb31a343ea8fce26be71b5998
Updates #27754
Fixes #31305
Change-Id: I8fcc3bc3c718cf0d93afbd1d383df48316b522d4
Reviewed-on: https://go-review.googlesource.com/136455
Run-TryBot: Michael Hudson-Doyle <michael.hudson@canonical.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-on: https://go-review.googlesource.com/c/go/+/200057
Run-TryBot: Bryan C. Mills <bcmills@google.com>
-rw-r--r-- | src/cmd/vendor/golang.org/x/arch/LICENSE | 27 | ||||
-rw-r--r-- | src/cmd/vendor/golang.org/x/arch/PATENTS | 22 | ||||
-rw-r--r-- | src/cmd/vendor/golang.org/x/arch/arm64/arm64asm/objdump_test.go | 12 | ||||
-rw-r--r-- | src/cmd/vendor/vendor.json | 7 |
4 files changed, 65 insertions, 3 deletions
diff --git a/src/cmd/vendor/golang.org/x/arch/LICENSE b/src/cmd/vendor/golang.org/x/arch/LICENSE new file mode 100644 index 0000000000..d29b37261f --- /dev/null +++ b/src/cmd/vendor/golang.org/x/arch/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2015 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/cmd/vendor/golang.org/x/arch/PATENTS b/src/cmd/vendor/golang.org/x/arch/PATENTS new file mode 100644 index 0000000000..733099041f --- /dev/null +++ b/src/cmd/vendor/golang.org/x/arch/PATENTS @@ -0,0 +1,22 @@ +Additional IP Rights Grant (Patents) + +"This implementation" means the copyrightable works distributed by +Google as part of the Go project. + +Google hereby grants to You a perpetual, worldwide, non-exclusive, +no-charge, royalty-free, irrevocable (except as stated in this section) +patent license to make, have made, use, offer to sell, sell, import, +transfer and otherwise run, modify and propagate the contents of this +implementation of Go, where such license applies only to those patent +claims, both currently owned or controlled by Google and acquired in +the future, licensable by Google that are necessarily infringed by this +implementation of Go. This grant does not include claims that would be +infringed only as a consequence of further modification of this +implementation. If you or your agent or exclusive licensee institute or +order or agree to the institution of patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging +that this implementation of Go or any code incorporated within this +implementation of Go constitutes direct or contributory patent +infringement, or inducement of patent infringement, then any patent +rights granted to you under this License for this implementation of Go +shall terminate as of the date such litigation is filed. diff --git a/src/cmd/vendor/golang.org/x/arch/arm64/arm64asm/objdump_test.go b/src/cmd/vendor/golang.org/x/arch/arm64/arm64asm/objdump_test.go index 261c7cae5f..3baf8a19dd 100644 --- a/src/cmd/vendor/golang.org/x/arch/arm64/arm64asm/objdump_test.go +++ b/src/cmd/vendor/golang.org/x/arch/arm64/arm64asm/objdump_test.go @@ -103,6 +103,13 @@ func allowedMismatchObjdump(text string, inst *Inst, dec ExtInst) bool { return true } } + // New objdump supports some newer mnemonics than this package. This + // package should be updated to support the new mnemonics and the sense + // of this reversed to continue passing with older objdumps but that + // requires internal ARM tooling. + if newForm, ok := newMnemonics[text]; ok && newForm == dec.text { + return true + } // GNU objdump misses spaces between operands for some instructions (e.g., "ld1 {v10.2s, v11.2s}, [x23],#16") if strings.Replace(text, " ", "", -1) == strings.Replace(dec.text, " ", "", -1) { return true @@ -148,3 +155,8 @@ var oldObjdumpMismatch = map[string]string{ "strh": "sturh", "prfm": "prfum", } + +var newMnemonics = map[string]string{ + "dsb #0x00": "ssbb", + "dsb #0x04": "pssbb", +} diff --git a/src/cmd/vendor/vendor.json b/src/cmd/vendor/vendor.json index ef7255acd1..e59e8a21cb 100644 --- a/src/cmd/vendor/vendor.json +++ b/src/cmd/vendor/vendor.json @@ -114,9 +114,10 @@ "revisionTime": "2018-04-06T10:28:20Z" }, { + "checksumSHA1": "wWnXz4wz8/jDvPd+xXU22nBuqYw=", "path": "golang.org/x/arch/arm64/arm64asm", - "revision": "9111c30535f37e70dcaf5956d34b03233f90f3b6", - "revisionTime": "2018-03-13T04:07:09Z" + "revision": "b19384d3c130858bb31a343ea8fce26be71b5998", + "revisionTime": "2018-09-20T07:20:31Z" }, { "path": "golang.org/x/arch/ppc64/ppc64asm", @@ -381,5 +382,5 @@ "revisionTime": "2018-11-05T19:48:08Z" } ], - "rootPath": "/cmd" + "rootPath": "cmd" } |