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

fixes w3m on arm android 7 (#1683)

Browse Source
This commit is contained in:
its-pointless 2017-10-19 20:28:28 +10:00 committed by Fredrik Fornwall
parent f42614383f
commit 21a2258783
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/libgc/os_dep.c.patch
View File

@ -1,14 +1,15 @@
--- ../cache/gc-7.6.0/os_dep.c 2016-08-02 19:36:14.000000000 +0000 --- ../cache/gc-7.6.0/os_dep.c 2016-08-02 19:36:14.000000000 +0000
+++ ./os_dep.c 2017-09-27 01:02:30.156628565 +0000 +++ ./os_dep.c 2017-10-19 03:43:03.800275032 +0000
@@ -426,7 +426,10 @@ @@ -426,7 +426,11 @@
# if (defined(LINUX) || defined(HURD)) && !defined(IGNORE_PROG_DATA_START) # if (defined(LINUX) || defined(HURD)) && !defined(IGNORE_PROG_DATA_START)
/* Try the easy approaches first: */ /* Try the easy approaches first: */
-# ifdef PLATFORM_ANDROID -# ifdef PLATFORM_ANDROID
+ /* this workaround for gold linker when only aarch64 is using it in + /* this workaround for gold linker when only aarch64 is using it in
+ termux breaks x86_64 and x86 builds */ + termux breaks x86_64 and x86 builds and also arm w3m apply it to
+ aarch64 only */
+ +
+# if defined(PLATFORM_ANDROID) && !defined(__x86_64__) && !defined(__i386__) +# if defined(PLATFORM_ANDROID) && defined(__aarch64__)
/* Workaround for "gold" (default) linker (as of Android NDK r10e). */ /* Workaround for "gold" (default) linker (as of Android NDK r10e). */
if ((word)__data_start < (word)_etext if ((word)__data_start < (word)_etext
&& (word)_etext < (word)__dso_handle) { && (word)_etext < (word)__dso_handle) {