From 33e3983db805ccf27f34a143d91e4346233a0ee2 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 4 Oct 2019 10:11:29 +0200 Subject: [PATCH] cmd/nm, runtime/cgo: add cgo support for freebsd/arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on work by Mikaƫl Urankar (@MikaelUrankar). Updates #24715 Updates #35197 Change-Id: I91144101043d67d3f8444bf8389c9606abe2a66c Reviewed-on: https://go-review.googlesource.com/c/go/+/199919 Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/cmd/dist/build.go | 2 +- src/cmd/nm/nm_cgo_test.go | 5 +++ src/runtime/cgo/gcc_freebsd_arm64.c | 68 +++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 src/runtime/cgo/gcc_freebsd_arm64.c diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index bc629e1d9ef..8d29eb98a76 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -1485,7 +1485,7 @@ var cgoEnabled = map[string]bool{ "freebsd/386": true, "freebsd/amd64": true, "freebsd/arm": true, - "freebsd/arm64": false, + "freebsd/arm64": true, "illumos/amd64": true, "linux/386": true, "linux/amd64": true, diff --git a/src/cmd/nm/nm_cgo_test.go b/src/cmd/nm/nm_cgo_test.go index 475c57b4c24..9a257e0ed2e 100644 --- a/src/cmd/nm/nm_cgo_test.go +++ b/src/cmd/nm/nm_cgo_test.go @@ -17,6 +17,11 @@ func canInternalLink() bool { return false case "dragonfly": return false + case "freebsd": + switch runtime.GOARCH { + case "arm64": + return false + } case "linux": switch runtime.GOARCH { case "arm64", "mips64", "mips64le", "mips", "mipsle", "ppc64", "ppc64le": diff --git a/src/runtime/cgo/gcc_freebsd_arm64.c b/src/runtime/cgo/gcc_freebsd_arm64.c new file mode 100644 index 00000000000..dd8f8882905 --- /dev/null +++ b/src/runtime/cgo/gcc_freebsd_arm64.c @@ -0,0 +1,68 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +#include +#include +#include +#include +#include +#include +#include "libcgo.h" +#include "libcgo_unix.h" + +static void* threadentry(void*); +static void (*setg_gcc)(void*); + +void +x_cgo_init(G *g, void (*setg)(void*)) +{ + pthread_attr_t attr; + size_t size; + + setg_gcc = setg; + pthread_attr_init(&attr); + pthread_attr_getstacksize(&attr, &size); + g->stacklo = (uintptr)&attr - size + 4096; + pthread_attr_destroy(&attr); +} + +void +_cgo_sys_thread_start(ThreadStart *ts) +{ + pthread_attr_t attr; + sigset_t ign, oset; + pthread_t p; + size_t size; + int err; + + SIGFILLSET(ign); + pthread_sigmask(SIG_SETMASK, &ign, &oset); + + pthread_attr_init(&attr); + pthread_attr_getstacksize(&attr, &size); + // Leave stacklo=0 and set stackhi=size; mstart will do the rest. + ts->g->stackhi = size; + err = _cgo_try_pthread_create(&p, &attr, threadentry, ts); + + pthread_sigmask(SIG_SETMASK, &oset, nil); + + if (err != 0) { + fprintf(stderr, "runtime/cgo: pthread_create failed: %s\n", strerror(err)); + abort(); + } +} + +extern void crosscall1(void (*fn)(void), void (*setg_gcc)(void*), void *g); + +static void* +threadentry(void *v) +{ + ThreadStart ts; + + ts = *(ThreadStart*)v; + free(v); + + crosscall1(ts.fn, setg_gcc, (void*)ts.g); + return nil; +}