On Sat, Feb 1, 2020 at 5:38 AM Andreas Schwab <sch...@linux-m68k.org> wrote:
>
> ../../../libgo/go/syscall/syscall_linux_riscv64.go:7:14: error: imported and
> not used: unsafe
> 7 | import "unsafe"
> | ^
> ../../../libgo/go/syscall/syscall_linux_riscv64.go:13:1: error: redefinition
> of 'SetLen'
> 13 | func (iov *Iovec) SetLen(length int) {
> | ^
> ../../../libgo/go/syscall/socket.go:437:1: note: previous definition of
> 'SetLen' was here
> 437 | func (iov *Iovec) SetLen(length int) {
> | ^
> ../../../libgo/go/syscall/syscall_linux_riscv64.go:17:1: error: redefinition
> of 'SetControllen'
> 17 | func (msghdr *Msghdr) SetControllen(length int) {
> | ^
> ../../../libgo/go/syscall/socket.go:441:1: note: previous definition of
> 'SetControllen' was here
> 441 | func (msghdr *Msghdr) SetControllen(length int) {
> | ^
> ../../../libgo/go/syscall/syscall_linux_riscv64.go:21:1: error: redefinition
> of 'SetLen'
> 21 | func (cmsg *Cmsghdr) SetLen(length int) {
> | ^
> ../../../libgo/go/syscall/socket.go:445:1: note: previous definition of
> 'SetLen' was here
> 445 | func (cmsg *Cmsghdr) SetLen(length int) {
> | ^
> ../../../libgo/go/syscall/syscall_linux_riscv64.go:14:10: error: incompatible
> types in assignment (cannot use type uint64 as type Iovec_len_t)
> 14 | iov.Len = uint64(length)
> | ^
> ../../../libgo/go/syscall/syscall_linux_riscv64.go:18:20: error: incompatible
> types in assignment (cannot use type uint64 as type Msghdr_controllen_t)
> 18 | msghdr.Controllen = uint64(length)
> | ^
> ../../../libgo/go/syscall/syscall_linux_riscv64.go:22:11: error: incompatible
> types in assignment (cannot use type uint64 as type Cmsghdr_len_t)
> 22 | cmsg.Len = uint64(length)
> | ^
Thanks. Fixed like so. Committed to mainline.
Ian
79530f94e9c53153c4fae3b50a8c938f89db0c32
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 40529518b26..27f4ce342e5 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-d796680b5a78f686ed118578e81d5b1adf48508d
+c94637ad6fd38d4814fb02d094a1a73f19323d71
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/go/syscall/syscall_linux_riscv64.go
b/libgo/go/syscall/syscall_linux_riscv64.go
index e9aab94e3a1..16d8709708d 100644
--- a/libgo/go/syscall/syscall_linux_riscv64.go
+++ b/libgo/go/syscall/syscall_linux_riscv64.go
@@ -4,20 +4,6 @@
package syscall
-import "unsafe"
-
func (r *PtraceRegs) PC() uint64 { return r.Pc }
func (r *PtraceRegs) SetPC(pc uint64) { r.Pc = pc }
-
-func (iov *Iovec) SetLen(length int) {
- iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
- msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
- cmsg.Len = uint64(length)
-}
