syscall: emulate Flock on AIX

    Reviewed-on: https://go-review.googlesource.com/79095

From-SVN: r255737

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 14baef5f6c24fe92a764f52fd4a51c32289b00da..35a2d0a38d29c8b64e5fb41cf734485ac453740a 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-c02de8ca63f52a2475ce8645edee3203a3c908ac
+d1f90c9b77baca5c33a398ab844fb4440c6a5ee7
 
 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 072f92a8151551a961975c222dccb089715afd86..5afc65e7a1551a62db38b4435f90f00e3acd638b 100644 (file)
--- a/libgo/go/syscall/libcall_aix.go
+++ b/libgo/go/syscall/libcall_aix.go
@@ -111,6 +111,28 @@ 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