diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-09-09 23:13:08 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-09-09 23:13:08 +0000 |
| commit | 8bdcbd013538dae97e72ba4c3c54f524daeeac72 (patch) | |
| tree | 2c833548540b7f4ce55f6d10457f059ba892ed39 | |
| parent | de0f55dbb314264d7858a9d98c805285c62f5b6b (diff) | |
| download | gcc-8bdcbd013538dae97e72ba4c3c54f524daeeac72.zip gcc-8bdcbd013538dae97e72ba4c3c54f524daeeac72.tar.gz gcc-8bdcbd013538dae97e72ba4c3c54f524daeeac72.tar.bz2 | |
misc/cgo/testcshared: restore gofrontend-local changes
They were lost when the files were moved in the update to Go1.13beta1.
These changes should be made in the master repo for the 1.14 release,
as riscv64 support is added there.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/194343
From-SVN: r275551
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/misc/cgo/testcshared/testdata/libgo2/dup2.go | 2 | ||||
| -rw-r--r-- | libgo/misc/cgo/testcshared/testdata/libgo2/dup3.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index c75e959..21f9e48 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -03fa49394bb4b37453795bef3119e5b40c929aee +c6097f269d2b3dbfd5204cf7e3d0b9f8d7ec2b5e The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/misc/cgo/testcshared/testdata/libgo2/dup2.go b/libgo/misc/cgo/testcshared/testdata/libgo2/dup2.go index d18f0b1..d343aa5 100644 --- a/libgo/misc/cgo/testcshared/testdata/libgo2/dup2.go +++ b/libgo/misc/cgo/testcshared/testdata/libgo2/dup2.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 darwin dragonfly freebsd linux,!arm64 netbsd openbsd +// +build darwin dragonfly freebsd linux,!arm64,!riscv64 netbsd openbsd package main diff --git a/libgo/misc/cgo/testcshared/testdata/libgo2/dup3.go b/libgo/misc/cgo/testcshared/testdata/libgo2/dup3.go index c9c65a6..459f0dc 100644 --- a/libgo/misc/cgo/testcshared/testdata/libgo2/dup3.go +++ b/libgo/misc/cgo/testcshared/testdata/libgo2/dup3.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,arm64 +// +build linux,arm64 linux,riscv64 package main |