diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/syscall/syscall_funcs.go | 4 | ||||
| -rw-r--r-- | libgo/go/syscall/syscall_funcs_stubs.go | 4 | ||||
| -rw-r--r-- | libgo/runtime/go-nosys.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index c39aca9..59badf8 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -092668d6ce6d7b3aff6797247cd53dc44319c558 +f9ea9801058aa98a421784da12b76cda0b4c6cf2 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/syscall_funcs.go b/libgo/go/syscall/syscall_funcs.go index a906fa5..fc14cb1 100644 --- a/libgo/go/syscall/syscall_funcs.go +++ b/libgo/go/syscall/syscall_funcs.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build darwin || dragonfly || freebsd || hurd || linux || netbsd || openbsd || solaris -// +build darwin dragonfly freebsd hurd linux netbsd openbsd solaris +//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package syscall diff --git a/libgo/go/syscall/syscall_funcs_stubs.go b/libgo/go/syscall/syscall_funcs_stubs.go index 11f12bd..e37a6483 100644 --- a/libgo/go/syscall/syscall_funcs_stubs.go +++ b/libgo/go/syscall/syscall_funcs_stubs.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build aix || rtems -// +build aix rtems +//go:build aix || hurd || rtems +// +build aix hurd rtems // These are stubs. diff --git a/libgo/runtime/go-nosys.c b/libgo/runtime/go-nosys.c index 30222df..cd3e766 100644 --- a/libgo/runtime/go-nosys.c +++ b/libgo/runtime/go-nosys.c @@ -504,7 +504,7 @@ strerror_r (int errnum, char *buf, size_t buflen) #endif /* ! HAVE_STRERROR_R */ -#ifndef HAVE_SYSCALL +#if !defined(HAVE_SYSCALL) && !defined(__GNU__) /* GNU/Hurd already has a stub */ int syscall(int number __attribute__ ((unused)), ...) { |