syscall: remove Flock for aix/ppc64

    CL 152397 removed it from gc's syscall package.

    Updates golang/go#29084

    Reviewed-on: https://go-review.googlesource.com/c/152557

From-SVN: r266812

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 558f713fbb5d0688df7beaf0afd356242dab0fd9..7693242a42eabcd35e0471469829f2c8c73c9547 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-7259d9a403db2784c7d03239c6a50e730062fc61
+d3a98b7a9ea8032be22ebb3ea2f389ce22669d53
 
 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/libcall_aix.go b/libgo/go/syscall/libcall_aix.go
index 5afc65e7a1551a62db38b4435f90f00e3acd638b..072f92a8151551a961975c222dccb089715afd86 100644 (file)
--- a/libgo/go/syscall/libcall_aix.go
+++ b/libgo/go/syscall/libcall_aix.go
@@ -111,28 +111,6 @@ func Reboot(how int) (err error) {
 //sys  Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
 //fchownat(dirfd _C_int, path *byte, owner Uid_t, group Gid_t, flags _C_int) _C_int
 
-// On AIX, there is no flock() system call, we emulate it.
-func Flock(fd int, op int) (err error) {
-       lk := &Flock_t{}
-       if (op & LOCK_UN) != 0 {
-               lk.Type = F_UNLCK
-       } else if (op & LOCK_EX) != 0 {
-               lk.Type = F_WRLCK
-       } else if (op & LOCK_SH) != 0 {
-               lk.Type = F_RDLCK
-       } else {
-               return nil
-       }
-       if (op & LOCK_NB) != 0 {
-               err = FcntlFlock(uintptr(fd), F_SETLK, lk)
-               if err != nil && (err == EAGAIN || err == EACCES) {
-                       return EWOULDBLOCK
-               }
-               return err
-       }
-       return FcntlFlock(uintptr(fd), F_SETLKW, lk)
-}
-
 //sys  Fstatfs(fd int, buf *Statfs_t) (err error)
 //fstatfs64(fd _C_int, buf *Statfs_t) _C_int