From d00f9deb0238e215423667de62189a1ce954243a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 15 Sep 2017 22:57:23 +0000 Subject: [PATCH] syscall: fixes for Solaris Patch by Rainer Orth. Reviewed-on: https://go-review.googlesource.com/64170 From-SVN: r252866 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/golang_org/x/net/lif/link.go | 2 +- libgo/go/syscall/forkpipe_bsd.go | 2 +- libgo/go/syscall/libcall_solaris.go | 12 ++++++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 libgo/go/syscall/libcall_solaris.go diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index aafc5269095..4081aa946b6 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -70cf67704699c8bcaf6f52437812367cdc4ad169 +abe58fdc529378706d65d6b22e4871646eb9023e 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/golang_org/x/net/lif/link.go b/libgo/go/golang_org/x/net/lif/link.go index 70e0262781d..912472fdac1 100644 --- a/libgo/go/golang_org/x/net/lif/link.go +++ b/libgo/go/golang_org/x/net/lif/link.go @@ -70,7 +70,7 @@ func Links(af int, name string) ([]Link, error) { func links(eps []endpoint, name string) ([]Link, error) { var lls []Link - lifn := lifnum{Flags: sysLIFC_NOXMIT | sysLIFC_TEMPORARY | sysLIFC_ALLZONES | sysLIFC_UNDER_IPMP} + lifn := sysLifnum{Flags: sysLIFC_NOXMIT | sysLIFC_TEMPORARY | sysLIFC_ALLZONES | sysLIFC_UNDER_IPMP} lifc := lifconf{Flags: sysLIFC_NOXMIT | sysLIFC_TEMPORARY | sysLIFC_ALLZONES | sysLIFC_UNDER_IPMP} for _, ep := range eps { lifn.Family = uint16(ep.af) diff --git a/libgo/go/syscall/forkpipe_bsd.go b/libgo/go/syscall/forkpipe_bsd.go index d41807220aa..28897bfd790 100644 --- a/libgo/go/syscall/forkpipe_bsd.go +++ b/libgo/go/syscall/forkpipe_bsd.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 netbsd openbsd +// +build darwin dragonfly netbsd openbsd solaris package syscall diff --git a/libgo/go/syscall/libcall_solaris.go b/libgo/go/syscall/libcall_solaris.go new file mode 100644 index 00000000000..a02661401a8 --- /dev/null +++ b/libgo/go/syscall/libcall_solaris.go @@ -0,0 +1,12 @@ +// Copyright 2017 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. + +package syscall + +//sys Getdents(fd int, buf []byte) (n int, err error) +//getdents(fd _C_int, buf *byte, nbyte Size_t) _C_int + +func ReadDirent(fd int, buf []byte) (n int, err error) { + return Getdents(fd, buf) +} -- 2.30.2