os, syscall: handle _st_timespec for AIX stat

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

From-SVN: r256450

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index dd7febbd9c8e3d479270202c9726382e1fe7d282..7abc2136aa6518a6eabf6675959d66dfd1157693 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-d8a9f7433a9e8a81c992ad2908818d2e84f3698b
+19d94969c5202c07b3b166079b9f4ebbb52dfa6b
 
 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/os/stat_aix.go b/libgo/go/os/stat_aix.go
new file mode 100644 (file)
index 0000000..265761f
--- /dev/null
+++ b/libgo/go/os/stat_aix.go
@@ -0,0 +1,51 @@
+// Copyright 2009 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 os
+
+import (
+       "syscall"
+       "time"
+)
+
+func fillFileStatFromSys(fs *fileStat, name string) {
+       fs.name = basename(name)
+       fs.size = int64(fs.sys.Size)
+       fs.modTime = stTimespecToTime(fs.sys.Mtim)
+       fs.mode = FileMode(fs.sys.Mode & 0777)
+       switch fs.sys.Mode & syscall.S_IFMT {
+       case syscall.S_IFBLK:
+               fs.mode |= ModeDevice
+       case syscall.S_IFCHR:
+               fs.mode |= ModeDevice | ModeCharDevice
+       case syscall.S_IFDIR:
+               fs.mode |= ModeDir
+       case syscall.S_IFIFO:
+               fs.mode |= ModeNamedPipe
+       case syscall.S_IFLNK:
+               fs.mode |= ModeSymlink
+       case syscall.S_IFREG:
+               // nothing to do
+       case syscall.S_IFSOCK:
+               fs.mode |= ModeSocket
+       }
+       if fs.sys.Mode&syscall.S_ISGID != 0 {
+               fs.mode |= ModeSetgid
+       }
+       if fs.sys.Mode&syscall.S_ISUID != 0 {
+               fs.mode |= ModeSetuid
+       }
+       if fs.sys.Mode&syscall.S_ISVTX != 0 {
+               fs.mode |= ModeSticky
+       }
+}
+
+func stTimespecToTime(ts syscall.StTimespec) time.Time {
+       return time.Unix(int64(ts.Sec), int64(ts.Nsec))
+}
+
+// For testing.
+func atime(fi FileInfo) time.Time {
+       return stTimespecToTime(fi.Sys().(*syscall.Stat_t).Atim)
+}

diff --git a/libgo/go/os/stat_atim.go b/libgo/go/os/stat_atim.go
index 82481c04a7bfa822f60d7b71147d468bcfd3257e..ef8a574e7bbd8be08f28e44af7c09d308a5e1f75 100644 (file)
--- a/libgo/go/os/stat_atim.go
+++ b/libgo/go/os/stat_atim.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 aix linux openbsd solaristag
+// +build linux openbsd solaristag
 
 package os
 

diff --git a/libgo/go/syscall/syscall_aix.go b/libgo/go/syscall/syscall_aix.go
index c2554eb8c6c5ee05d81096f72f6367e3ea87ecdc..231ff40500f2cc6f22930a32f87758bd6f5121ea 100644 (file)
--- a/libgo/go/syscall/syscall_aix.go
+++ b/libgo/go/syscall/syscall_aix.go
@@ -6,6 +6,14 @@ package syscall
 
 import "unsafe"
 
+func (ts *StTimespec) Unix() (sec int64, nsec int64) {
+       return int64(ts.Sec), int64(ts.Nsec)
+}
+
+func (ts *StTimespec) Nano() int64 {
+       return int64(ts.Sec)*1e9 + int64(ts.Nsec)
+}
+
 func direntIno(buf []byte) (uint64, bool) {
        return readInt(buf, unsafe.Offsetof(Dirent{}.Ino), unsafe.Sizeof(Dirent{}.Ino))
 }

diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index c3495de72f62ac2219a4cdbf71d8574da38491fd..35ce1410ac0d6771cbe0f72648afe80515b64f55 100755 (executable)
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -443,6 +443,12 @@ grep '^type _tms ' gen-sysinfo.go | \
       -e 's/tms_cstime/Cstime/' \
     >> ${OUT}
 
+# AIX uses st_timespec struct for stat.
+grep '^type _st_timespec ' gen-sysinfo.go | \
+    sed -e 's/type _st_timespec /type StTimespec /' \
+      -e 's/tv_sec/Sec/' \
+      -e 's/tv_nsec/Nsec/' >> ${OUT}
+
 # The stat type.
 # Prefer largefile variant if available.
 stat=`grep '^type _stat64 ' gen-sysinfo.go || true`
@@ -467,7 +473,7 @@ fi | sed -e 's/type _stat64/type Stat_t/' \
          -e 's/st_ctim/Ctim/' \
          -e 's/\([^a-zA-Z0-9_]\)_timeval\([^a-zA-Z0-9_]\)/\1Timeval\2/g' \
          -e 's/\([^a-zA-Z0-9_]\)_timespec_t\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \
-         -e 's/\([^a-zA-Z0-9_]\)_st_timespec_t\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \
+         -e 's/\([^a-zA-Z0-9_]\)_st_timespec_t\([^a-zA-Z0-9_]\)/\1StTimespec\2/g' \
          -e 's/\([^a-zA-Z0-9_]\)_timespec\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \
          -e 's/\([^a-zA-Z0-9_]\)_timestruc_t\([^a-zA-Z0-9_]\)/\1Timestruc\2/g' \
          -e 's/Godump_[0-9] struct { \([^;]*;\) };/\1/g' \