Skip to content

Commit 9586c09

Browse files
phstianlancetaylor
authored andcommitted
cmd/cgo: add missing parameter list for function _cgo_wait_runtime_init_done
Fixes #29879 Change-Id: Id2061a5eab67bb90a8116dc4f16073be1c9a09a9 GitHub-Last-Rev: 186863a GitHub-Pull-Request: #29900 Reviewed-on: https://go-review.googlesource.com/c/go/+/159178 Reviewed-by: Philipp Stephani <[email protected]> Reviewed-by: Emmanuel Odeke <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> Run-TryBot: Emmanuel Odeke <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent 3a62f4e commit 9586c09

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

src/cmd/cgo/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ _cgo_main.c:
710710
711711
int main() { return 0; }
712712
void crosscall2(void(*fn)(void*, int, uintptr_t), void *a, int c, uintptr_t ctxt) { }
713-
uintptr_t _cgo_wait_runtime_init_done() { return 0; }
713+
uintptr_t _cgo_wait_runtime_init_done(void) { return 0; }
714714
void _cgo_release_context(uintptr_t ctxt) { }
715715
char* _cgo_topofstack(void) { return (char*)0; }
716716
void _cgo_allocate(void *a, int c) { }

src/cmd/cgo/out.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ func (p *Package) writeDefs() {
5959
fmt.Fprintf(fm, "int main() { return 0; }\n")
6060
if *importRuntimeCgo {
6161
fmt.Fprintf(fm, "void crosscall2(void(*fn)(void*, int, __SIZE_TYPE__), void *a, int c, __SIZE_TYPE__ ctxt) { }\n")
62-
fmt.Fprintf(fm, "__SIZE_TYPE__ _cgo_wait_runtime_init_done() { return 0; }\n")
62+
fmt.Fprintf(fm, "__SIZE_TYPE__ _cgo_wait_runtime_init_done(void) { return 0; }\n")
6363
fmt.Fprintf(fm, "void _cgo_release_context(__SIZE_TYPE__ ctxt) { }\n")
6464
fmt.Fprintf(fm, "char* _cgo_topofstack(void) { return (char*)0; }\n")
6565
} else {
6666
// If we're not importing runtime/cgo, we *are* runtime/cgo,
6767
// which provides these functions. We just need a prototype.
6868
fmt.Fprintf(fm, "void crosscall2(void(*fn)(void*, int, __SIZE_TYPE__), void *a, int c, __SIZE_TYPE__ ctxt);\n")
69-
fmt.Fprintf(fm, "__SIZE_TYPE__ _cgo_wait_runtime_init_done();\n")
69+
fmt.Fprintf(fm, "__SIZE_TYPE__ _cgo_wait_runtime_init_done(void);\n")
7070
fmt.Fprintf(fm, "void _cgo_release_context(__SIZE_TYPE__);\n")
7171
}
7272
fmt.Fprintf(fm, "void _cgo_allocate(void *a, int c) { }\n")
@@ -784,7 +784,7 @@ func (p *Package) writeExports(fgo2, fm, fgcc, fgcch io.Writer) {
784784
fmt.Fprintf(fgcc, "#pragma GCC diagnostic ignored \"-Waddress-of-packed-member\"\n")
785785

786786
fmt.Fprintf(fgcc, "extern void crosscall2(void (*fn)(void *, int, __SIZE_TYPE__), void *, int, __SIZE_TYPE__);\n")
787-
fmt.Fprintf(fgcc, "extern __SIZE_TYPE__ _cgo_wait_runtime_init_done();\n")
787+
fmt.Fprintf(fgcc, "extern __SIZE_TYPE__ _cgo_wait_runtime_init_done(void);\n")
788788
fmt.Fprintf(fgcc, "extern void _cgo_release_context(__SIZE_TYPE__);\n\n")
789789
fmt.Fprintf(fgcc, "extern char* _cgo_topofstack(void);")
790790
fmt.Fprintf(fgcc, "%s\n", tsanProlog)
@@ -1924,5 +1924,5 @@ static void GoInit(void) {
19241924
runtime_iscgo = 1;
19251925
}
19261926
1927-
extern __SIZE_TYPE__ _cgo_wait_runtime_init_done() __attribute__ ((weak));
1927+
extern __SIZE_TYPE__ _cgo_wait_runtime_init_done(void) __attribute__ ((weak));
19281928
`

src/runtime/cgo/gcc_libinit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ x_cgo_sys_thread_create(void* (*func)(void*), void* arg) {
3232
}
3333

3434
uintptr_t
35-
_cgo_wait_runtime_init_done() {
35+
_cgo_wait_runtime_init_done(void) {
3636
void (*pfn)(struct context_arg*);
3737

3838
pthread_mutex_lock(&runtime_init_mu);

src/runtime/cgo/gcc_libinit_windows.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ _cgo_is_runtime_initialized() {
7070
}
7171

7272
uintptr_t
73-
_cgo_wait_runtime_init_done() {
73+
_cgo_wait_runtime_init_done(void) {
7474
void (*pfn)(struct context_arg*);
7575

7676
_cgo_maybe_run_preinit();

src/runtime/cgo/libcgo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void _cgo_sys_thread_start(ThreadStart *ts);
6161
* If runtime.SetCgoTraceback is used to set a context function,
6262
* calls the context function and returns the context value.
6363
*/
64-
uintptr_t _cgo_wait_runtime_init_done();
64+
uintptr_t _cgo_wait_runtime_init_done(void);
6565

6666
/*
6767
* Call fn in the 6c world.

0 commit comments

Comments
 (0)