diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 3d20e7152cbb694ad44ee92b88563dbd78ba504d..3351558b27f60c906d12686674736a0c3cd7a740 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -db8e3801bf8508656606d6e465c76cdc6e9a9eb7 +a28f1d8aa306bdb5166af1f087e5f5027ce51d6d The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/go-nosys.c b/libgo/runtime/go-nosys.c index 154f6b1e8be467802b86d376aa99907ec9b7213d..30222df781599c966ac3da440cdb6b47d26248e9 100644 --- a/libgo/runtime/go-nosys.c +++ b/libgo/runtime/go-nosys.c @@ -506,7 +506,7 @@ strerror_r (int errnum, char *buf, size_t buflen) #ifndef HAVE_SYSCALL int -syscall(int number, ...) +syscall(int number __attribute__ ((unused)), ...) { errno = ENOSYS; return -1;