diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/syscall/exec_unix.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 6216047500b..8fe2b207c75 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -6b4b969f552b8f9ac87a715d5ad06e52bd031b60 +e9550aa81d38ada037f675f50cbc09e6f1c35c12 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/exec_unix.go b/libgo/go/syscall/exec_unix.go index 7427c57b703..218d78cf146 100644 --- a/libgo/go/syscall/exec_unix.go +++ b/libgo/go/syscall/exec_unix.go @@ -41,10 +41,10 @@ import ( //sysnb raw_close(fd int) (err Errno) //close(fd _C_int) _C_int -//sysnb raw_ioctl(fd int, cmd int, val int) (rval int, err Errno) +//sysnb raw_ioctl(fd int, cmd uintptr, val int) (rval int, err Errno) //__go_ioctl(fd _C_int, cmd _C_int, val _C_int) _C_int -//sysnb raw_ioctl_ptr(fd int, cmd int, val unsafe.Pointer) (rval int, err Errno) +//sysnb raw_ioctl_ptr(fd int, cmd uintptr, val unsafe.Pointer) (rval int, err Errno) //__go_ioctl_ptr(fd _C_int, cmd _C_int, val unsafe.Pointer) _C_int //sysnb raw_execve(argv0 *byte, argv **byte, envv **byte) (err Errno) |