diff options
| author | Elias Naur <mail@eliasnaur.com> | 2020-12-25 11:14:11 +0100 |
|---|---|---|
| committer | Carlos Amedee <carlos@golang.org> | 2021-02-04 14:27:44 +0000 |
| commit | c3e1c3800bfb56bf1b0c3d696f59f42b16bd4fc2 (patch) | |
| tree | 3a3cd24af895a43bc69df68088286865dfc826a2 | |
| parent | 3171f483775c7eb8d38b68f53d8fd5078db7f967 (diff) | |
| download | go-c3e1c3800bfb56bf1b0c3d696f59f42b16bd4fc2.tar.gz go-c3e1c3800bfb56bf1b0c3d696f59f42b16bd4fc2.zip | |
[release-branch.go1.15] runtime/cgo: fix Android build with NDK 22
Fixes #43406
Change-Id: I7d2b70098a4ba4dcb325fb0be076043789b86135
Reviewed-on: https://go-review.googlesource.com/c/go/+/280312
Run-TryBot: Elias Naur <mail@eliasnaur.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Trust: Elias Naur <mail@eliasnaur.com>
(cherry picked from commit 1d78139128d6d839d7da0aeb10b3e51b6c7c0749)
Reviewed-on: https://go-review.googlesource.com/c/go/+/289149
| -rw-r--r-- | src/runtime/cgo/gcc_linux_386.c | 2 | ||||
| -rw-r--r-- | src/runtime/cgo/gcc_linux_amd64.c | 2 | ||||
| -rw-r--r-- | src/runtime/cgo/gcc_linux_arm.c | 2 | ||||
| -rw-r--r-- | src/runtime/cgo/gcc_linux_arm64.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime/cgo/gcc_linux_386.c b/src/runtime/cgo/gcc_linux_386.c index ece9f933c56..70c942aeb84 100644 --- a/src/runtime/cgo/gcc_linux_386.c +++ b/src/runtime/cgo/gcc_linux_386.c @@ -12,7 +12,7 @@ static void *threadentry(void*); static void (*setg_gcc)(void*); // This will be set in gcc_android.c for android-specific customization. -void (*x_cgo_inittls)(void **tlsg, void **tlsbase); +void (*x_cgo_inittls)(void **tlsg, void **tlsbase) __attribute__((common)); void x_cgo_init(G *g, void (*setg)(void*), void **tlsg, void **tlsbase) diff --git a/src/runtime/cgo/gcc_linux_amd64.c b/src/runtime/cgo/gcc_linux_amd64.c index 9134e0df920..f2bf6482cb5 100644 --- a/src/runtime/cgo/gcc_linux_amd64.c +++ b/src/runtime/cgo/gcc_linux_amd64.c @@ -14,7 +14,7 @@ static void* threadentry(void*); static void (*setg_gcc)(void*); // This will be set in gcc_android.c for android-specific customization. -void (*x_cgo_inittls)(void **tlsg, void **tlsbase); +void (*x_cgo_inittls)(void **tlsg, void **tlsbase) __attribute__((common)); void x_cgo_init(G *g, void (*setg)(void*), void **tlsg, void **tlsbase) diff --git a/src/runtime/cgo/gcc_linux_arm.c b/src/runtime/cgo/gcc_linux_arm.c index 61855b96b22..5bc0fee90d4 100644 --- a/src/runtime/cgo/gcc_linux_arm.c +++ b/src/runtime/cgo/gcc_linux_arm.c @@ -10,7 +10,7 @@ static void *threadentry(void*); -void (*x_cgo_inittls)(void **tlsg, void **tlsbase); +void (*x_cgo_inittls)(void **tlsg, void **tlsbase) __attribute__((common)); static void (*setg_gcc)(void*); void diff --git a/src/runtime/cgo/gcc_linux_arm64.c b/src/runtime/cgo/gcc_linux_arm64.c index 261c884ac95..17ff274fbbe 100644 --- a/src/runtime/cgo/gcc_linux_arm64.c +++ b/src/runtime/cgo/gcc_linux_arm64.c @@ -12,7 +12,7 @@ static void *threadentry(void*); -void (*x_cgo_inittls)(void **tlsg, void **tlsbase); +void (*x_cgo_inittls)(void **tlsg, void **tlsbase) __attribute__((common)); static void (*setg_gcc)(void*); void |