From 389578d7a660986712eefc1785c9278d3457cd7a Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 10 Jan 2018 15:42:23 +0000
Subject: [PATCH] re PR c/82922 (Request: add -Wstrict-prototypes to -Wextra as
 K&R style is obsolescent)

	PR c/82922

    runtime, syscall: use full prototypes in C code

    Based on patch by Martin Sebor.

    Reviewed-on: https://go-review.googlesource.com/86815

From-SVN: r256437
---
 gcc/go/gofrontend/MERGE          | 2 +-
 libgo/go/syscall/errno.c         | 4 ++--
 libgo/runtime/go-now.c           | 4 ++--
 libgo/runtime/go-runtime-error.c | 2 +-
 libgo/runtime/proc.c             | 4 +---
 libgo/runtime/runtime.h          | 4 +---
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 13df7558fe4..e66cc488769 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-4b8036b3f995cdb0b99a9fa26c2af1e2420b4fa2
+9705a1f4c37ad2c099e9fe6cd587d22a2a2ab2c3
 
 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/errno.c b/libgo/go/syscall/errno.c
index 5cdc7730445..1e822f108cc 100644
--- a/libgo/go/syscall/errno.c
+++ b/libgo/go/syscall/errno.c
@@ -11,11 +11,11 @@
 /* errno is typically a macro. These functions set 
    and get errno specific to the libc being used.  */
 
-uintptr_t GetErrno() __asm__ (GOSYM_PREFIX "syscall.GetErrno");
+uintptr_t GetErrno(void) __asm__ (GOSYM_PREFIX "syscall.GetErrno");
 void SetErrno(uintptr_t) __asm__ (GOSYM_PREFIX "syscall.SetErrno");
 
 uintptr_t
-GetErrno()
+GetErrno(void)
 {
   return (uintptr_t) errno;
 }
diff --git a/libgo/runtime/go-now.c b/libgo/runtime/go-now.c
index 13e8f517722..a45890bfd5a 100644
--- a/libgo/runtime/go-now.c
+++ b/libgo/runtime/go-now.c
@@ -16,11 +16,11 @@ struct walltime_ret
   int32_t nsec;
 };
 
-struct walltime_ret now() __asm__ (GOSYM_PREFIX "runtime.walltime")
+struct walltime_ret now(void) __asm__ (GOSYM_PREFIX "runtime.walltime")
   __attribute__ ((no_split_stack));
 
 struct walltime_ret
-now()
+now(void)
 {
   struct timespec ts;
   struct walltime_ret ret;
diff --git a/libgo/runtime/go-runtime-error.c b/libgo/runtime/go-runtime-error.c
index 4f563fc9ed5..5edbeebdcf4 100644
--- a/libgo/runtime/go-runtime-error.c
+++ b/libgo/runtime/go-runtime-error.c
@@ -55,7 +55,7 @@ enum
   GO_NIL = 11
 };
 
-extern void __go_runtime_error () __attribute__ ((noreturn));
+extern void __go_runtime_error (int32) __attribute__ ((noreturn));
 
 void
 __go_runtime_error (int32 i)
diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
index 6d2adb8f791..556d86fb7d6 100644
--- a/libgo/runtime/proc.c
+++ b/libgo/runtime/proc.c
@@ -369,8 +369,6 @@ runtime_mcall(FuncVal *fv)
 //
 // Design doc at http://golang.org/s/go11sched.
 
-extern bool* runtime_getCgoHasExtraM()
-  __asm__ (GOSYM_PREFIX "runtime.getCgoHasExtraM");
 extern G* allocg(void)
   __asm__ (GOSYM_PREFIX "runtime.allocg");
 
@@ -560,7 +558,7 @@ void setGContext(void) __asm__ (GOSYM_PREFIX "runtime.setGContext");
 
 // setGContext sets up a new goroutine context for the current g.
 void
-setGContext()
+setGContext(void)
 {
 	int val;
 	G *gp;
diff --git a/libgo/runtime/runtime.h b/libgo/runtime/runtime.h
index 4124e9dc0a9..28d550deee5 100644
--- a/libgo/runtime/runtime.h
+++ b/libgo/runtime/runtime.h
@@ -473,9 +473,7 @@ extern void typedmemmove(const Type *, void *, const void *)
   __asm__ (GOSYM_PREFIX "runtime.typedmemmove");
 extern void setncpu(int32)
   __asm__(GOSYM_PREFIX "runtime.setncpu");
-extern P** runtime_getAllP()
-  __asm__ (GOSYM_PREFIX "runtime.getAllP");
-extern Sched* runtime_getsched()
+extern Sched* runtime_getsched(void)
   __asm__ (GOSYM_PREFIX "runtime.getsched");
 extern void setpagesize(uintptr_t)
   __asm__(GOSYM_PREFIX "runtime.setpagesize");
-- 
2.30.2