diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
index d3e1d3a90c5a4e45098aa6393fe593455cf6e8d8..a469873c0547aa0aa61f8c9e0587591006894804 100644
--- a/libgo/go/syscall/libcall_linux.go
+++ b/libgo/go/syscall/libcall_linux.go
@@ -196,6 +196,10 @@ func PtraceDetach(pid int) (errno int) { return ptrace(PTRACE_DETACH, pid, 0, 0)
 // //sys	Fstatfs(fd int, buf *Statfs_t) (errno int)
 // //fstatfs(fd int, buf *Statfs_t) int
 
+// FIXME: Only available as a syscall.
+// //sysnb	Gettid() (tid int)
+// //gettid() Pid_t
+
 //sys	Ioperm(from int, num int, on int) (errno int)
 //ioperm(from _C_long, num _C_long, on int) int
 
@@ -298,8 +302,9 @@ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n i
 //sys	Tee(rfd int, wfd int, len int, flags int) (n int64, errno int)
 //tee(rfd int, wfd int, len Size_t, flags uint) Ssize_t
 
-//sysnb	Tgkill(tgid int, tid int, sig int) (errno int)
-//tgkill(tgid int, tid int, sig int) int
+// FIXME: Only available as a syscall.
+// //sysnb	Tgkill(tgid int, tid int, sig int) (errno int)
+// //tgkill(tgid int, tid int, sig int) int
 
 //sys	unlinkat(dirfd int, path string, flags int) (errno int)
 //unlinkat(dirfd int, path *byte, flags int) int
diff --git a/libgo/go/syscall/libcall_posix.go b/libgo/go/syscall/libcall_posix.go
index ea7dfc89af7a8eb6c6369c36a9bd4113f856ed6a..b83c2b5d97ec6bdd25df1b92615400e3ae11f171 100644
--- a/libgo/go/syscall/libcall_posix.go
+++ b/libgo/go/syscall/libcall_posix.go
@@ -236,9 +236,6 @@ func FDZero(set *FdSet) {
 //sysnb	Getrusage(who int, rusage *Rusage) (errno int)
 //getrusage(who int, rusage *Rusage) int
 
-//sysnb	Gettid() (tid int)
-//gettid() Pid_t
-
 //sysnb	gettimeofday(tv *Timeval, tz *byte) (errno int)
 //gettimeofday(tv *Timeval, tz *byte) int
 func Gettimeofday(tv *Timeval) (errno int) {
@@ -334,7 +331,7 @@ func Settimeofday(tv *Timeval) (errno int) {
 // //times(tms *Tms) _clock_t
 
 //sysnb	Umask(mask int) (oldmask int)
-//umark(mask Mode_t) Mode_t
+//umask(mask Mode_t) Mode_t
 
 //sys	Unlink(path string) (errno int)
 //unlink(path *byte) int