aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-06-11 19:16:34 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-06-11 19:16:34 +0000
commit87cbbc45a950f382853e2e4cf494cdfab62f0e5b (patch)
tree0b7b78b0758b88547ca25cfe34fb1a07373d739f /gcc
parentc5ce6f30886eed5f0bf8a98114bafbd65066b94f (diff)
downloadgcc-87cbbc45a950f382853e2e4cf494cdfab62f0e5b.zip
gcc-87cbbc45a950f382853e2e4cf494cdfab62f0e5b.tar.gz
gcc-87cbbc45a950f382853e2e4cf494cdfab62f0e5b.tar.bz2
libgo: add riscv and js/wasm as known targets
Incorporates cut down versions of https://golang.org/cl/102835 and https://golang.org/cl/106256 from the master sources. This will tell go/build to skip files with those tags. Reviewed-on: https://go-review.googlesource.com/117996 From-SVN: r261451
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 4c27161..0b28a5b 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-3ec698690d2a8ecbf115489f17d85e848a2f7293
+bfe3a9b26c8b2e1b9ef34a7232a2d1529e639bbf
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.