mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-17 20:11:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

syscall: remove Flock for aix/ppc64

Browse Source 
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
This commit is contained in:
Ian Lance Taylor 2018-12-05 01:11:02 +00:00
parent 4526e5eccb
commit 9cf3cb7c25
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -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.

22
libgo/go/syscall/libcall_aix.go
View File

@ -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