Fredrik Fornwall
6 years ago
5 changed files with 31 additions and 19 deletions
@ -0,0 +1,11 @@ |
|||
diff -u -r ../gc-8.0.2/include/private/gcconfig.h ./include/private/gcconfig.h
|
|||
--- ../gc-8.0.2/include/private/gcconfig.h 2018-12-23 21:28:41.000000000 +0000
|
|||
+++ ./include/private/gcconfig.h 2019-01-20 21:31:50.050945027 +0000
|
|||
@@ -2283,6 +2283,7 @@
|
|||
# define HBLKSIZE 4096 |
|||
# endif |
|||
# ifdef LINUX |
|||
+# define SEARCH_FOR_DATA_START
|
|||
# define OS_TYPE "LINUX" |
|||
# define LINUX_STACKBOTTOM |
|||
# define DYNAMIC_LOADING |
@ -1,15 +1,14 @@ |
|||
--- ../cache/gc-7.6.0/os_dep.c 2016-08-02 19:36:14.000000000 +0000
|
|||
+++ ./os_dep.c 2017-10-19 03:43:03.800275032 +0000
|
|||
@@ -426,7 +426,11 @@
|
|||
diff -u -r ../gc-8.0.2/os_dep.c ./os_dep.c
|
|||
--- ../gc-8.0.2/os_dep.c 2018-12-23 21:28:41.000000000 +0000
|
|||
+++ ./os_dep.c 2019-01-20 19:58:07.823582155 +0000
|
|||
@@ -436,7 +436,9 @@
|
|||
|
|||
# if (defined(LINUX) || defined(HURD)) && !defined(IGNORE_PROG_DATA_START) |
|||
/* Try the easy approaches first: */ |
|||
-# ifdef PLATFORM_ANDROID
|
|||
+ /* this workaround for gold linker when only aarch64 is using it in
|
|||
+ termux breaks x86_64 and x86 builds and also arm w3m apply it to
|
|||
+ aarch64 only */
|
|||
+
|
|||
+# if defined(PLATFORM_ANDROID) && defined(__aarch64__)
|
|||
-# ifdef HOST_ANDROID
|
|||
+# ifdef HOST_ANDROID_DISABLED_TERMUX
|
|||
+ /* This workaround for gold linker when only aarch64 is using it in
|
|||
+ Termux breaks other arches - apply it to aarch64 only. */
|
|||
/* Workaround for "gold" (default) linker (as of Android NDK r10e). */ |
|||
if ((word)__data_start < (word)_etext |
|||
&& (word)_etext < (word)__dso_handle) { |
|||
|
Loading…
Reference in new issue