PR go/52586

mksysinfo, syscall: Make sure SYS_GETDENTS64 is defined.

Fixes build on MIPS GNU/Linux.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@186987 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
index 7c9f05e..8d7da19 100644 (file)
--- a/libgo/go/syscall/libcall_linux.go
+++ b/libgo/go/syscall/libcall_linux.go
@@ -203,7 +203,11 @@ func Getdents(fd int, buf []byte) (n int, err error) {
                p = (*byte)(unsafe.Pointer(&_zero))
        }
        Entersyscall()
-       r1, _, errno := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(len(buf)))
+       s := SYS_GETDENTS64
+       if s == 0 {
+               s = SYS_GETDENTS
+       }
+       r1, _, errno := Syscall(uintptr(s), uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(len(buf)))
        n = int(r1)
        if n < 0 {
                err = errno

diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index db61a73..655337f 100755 (executable)
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -224,6 +224,14 @@ grep '^const _SYS_' gen-sysinfo.go | \
     echo "const $sup = _$sys" >> ${OUT}
   done
 
+# The GNU/Linux support wants to use SYS_GETDENTS64 if available.
+if ! grep '^const SYS_GETDENTS ' ${OUT} >/dev/null 2>&1; then
+  echo "const SYS_GETDENTS = 0" >> ${OUT}
+fi
+if ! grep '^const SYS_GETDENTS64 ' ${OUT} >/dev/null 2>&1; then
+  echo "const SYS_GETDENTS64 = 0" >> ${OUT}
+fi
+
 # Stat constants.
 grep '^const _S_' gen-sysinfo.go | \
   sed -e 's/^\(const \)_\(S_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}