sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

golang: fix bootstrapping

Browse Source
This commit is contained in:
Leonid Pliushch 2020-12-29 01:13:33 +02:00
parent 533e798729
commit 2ccbe9b60f
No known key found for this signature in database
GPG Key ID: 45F2964132545795
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/golang/clang11-fix.patch
View File

@ -1,48 +1,60 @@
diff -uNr go/src/runtime/cgo/gcc_linux_386.c go.mod/src/runtime/cgo/gcc_linux_386.c
--- go/src/runtime/cgo/gcc_linux_386.c 2020-12-03 19:32:44.000000000 +0200
+++ go.mod/src/runtime/cgo/gcc_linux_386.c 2020-12-29 00:48:40.168176970 +0200
@@ -12,7 +12,7 @@
+++ go.mod/src/runtime/cgo/gcc_linux_386.c 2020-12-29 01:13:05.120640580 +0200
@@ -12,7 +12,11 @@
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);
+#ifdef __ANDROID__
+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#else
void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#endif
void
x_cgo_init(G *g, void (*setg)(void*), void **tlsg, void **tlsbase)
diff -uNr go/src/runtime/cgo/gcc_linux_amd64.c go.mod/src/runtime/cgo/gcc_linux_amd64.c
--- go/src/runtime/cgo/gcc_linux_amd64.c 2020-12-03 19:32:44.000000000 +0200
+++ go.mod/src/runtime/cgo/gcc_linux_amd64.c 2020-12-29 00:48:32.264109154 +0200
@@ -14,7 +14,7 @@
+++ go.mod/src/runtime/cgo/gcc_linux_amd64.c 2020-12-29 01:11:57.624063728 +0200
@@ -14,7 +14,11 @@
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);
+#ifdef __ANDROID__
+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#else
void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#endif
void
x_cgo_init(G *g, void (*setg)(void*), void **tlsg, void **tlsbase)
diff -uNr go/src/runtime/cgo/gcc_linux_arm64.c go.mod/src/runtime/cgo/gcc_linux_arm64.c
--- go/src/runtime/cgo/gcc_linux_arm64.c 2020-12-03 19:32:44.000000000 +0200
+++ go.mod/src/runtime/cgo/gcc_linux_arm64.c 2020-12-29 00:12:33.341670237 +0200
@@ -12,7 +12,7 @@
+++ go.mod/src/runtime/cgo/gcc_linux_arm64.c 2020-12-29 01:12:17.648234844 +0200
@@ -12,7 +12,11 @@
static void *threadentry(void*);
-void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#ifdef __ANDROID__
+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#else
void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#endif
static void (*setg_gcc)(void*);
void
diff -uNr go/src/runtime/cgo/gcc_linux_arm.c go.mod/src/runtime/cgo/gcc_linux_arm.c
--- go/src/runtime/cgo/gcc_linux_arm.c 2020-12-03 19:32:44.000000000 +0200
+++ go.mod/src/runtime/cgo/gcc_linux_arm.c 2020-12-29 00:48:23.968037988 +0200
@@ -10,7 +10,7 @@
+++ go.mod/src/runtime/cgo/gcc_linux_arm.c 2020-12-29 01:12:38.656414386 +0200
@@ -10,7 +10,11 @@
static void *threadentry(void*);
-void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#ifdef __ANDROID__
+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#else
void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
+#endif
static void (*setg_gcc)(void*);
void