]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/nm, runtime/cgo: add cgo support for freebsd/arm64
authorTobias Klauser <tklauser@distanz.ch>
Fri, 4 Oct 2019 08:11:29 +0000 (10:11 +0200)
committerTobias Klauser <tobias.klauser@gmail.com>
Mon, 28 Oct 2019 10:25:44 +0000 (10:25 +0000)
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 <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/cmd/dist/build.go
src/cmd/nm/nm_cgo_test.go
src/runtime/cgo/gcc_freebsd_arm64.c [new file with mode: 0644]

index bc629e1d9efba636e223c1109a167ab073cee2f0..8d29eb98a76b4f6b36d25343128bb1e6d00e045e 100644 (file)
@@ -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,
index 475c57b4c2422e991ae155cf5ec1879e779aa0cf..9a257e0ed2eced69d18e9e6385aafe3d6286528f 100644 (file)
@@ -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 (file)
index 0000000..dd8f888
--- /dev/null
@@ -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 <sys/types.h>
+#include <errno.h>
+#include <sys/signalvar.h>
+#include <pthread.h>
+#include <signal.h>
+#include <string.h>
+#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;
+}