From bd36177bbfd539a46bb6274c079d752f114a26c4 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 20 Jan 2019 22:55:31 +0100
Subject: [PATCH] libgc: Update from 7.6.8 to 8.0.2

---
 packages/libgc/build.sh                         |  8 ++++----
 packages/libgc/include-private-gcconfig.h.patch | 11 +++++++++++
 packages/libgc/os_dep.c.patch                   | 17 ++++++++---------
 packages/libgc/pthread_stop_world.c.patch       | 13 +++++++------
 packages/zile/build.sh                          |  1 +
 5 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 packages/libgc/include-private-gcconfig.h.patch

diff --git a/packages/libgc/build.sh b/packages/libgc/build.sh
index 08b3a1d14..9833ac001 100644
--- a/packages/libgc/build.sh
+++ b/packages/libgc/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://www.hboehm.info/gc/
 TERMUX_PKG_DESCRIPTION="Library providing the Boehm-Demers-Weiser conservative garbage collector"
-TERMUX_PKG_VERSION=(7.6.8
-                    7.6.6)
-TERMUX_PKG_SHA256=(040ac5cdbf1bebc7c8cd4928996bbae0c54497c151ea5639838fa0128102e258
-                   99feabc5f54877f314db4fadeb109f0b3e1d1a54afb6b4b3dfba1e707e38e074)
+TERMUX_PKG_VERSION=(8.0.2
+                    7.6.8)
+TERMUX_PKG_SHA256=(4e8ca4b5b72a3a27971daefaa9b621f0a716695b23baa40b7eac78de2eeb51cb
+                   1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665)
 TERMUX_PKG_SRCURL=(https://github.com/ivmai/bdwgc/releases/download/v$TERMUX_PKG_VERSION/gc-$TERMUX_PKG_VERSION.tar.gz
 		   https://github.com/ivmai/libatomic_ops/releases/download/v${TERMUX_PKG_VERSION[1]}/libatomic_ops-${TERMUX_PKG_VERSION[1]}.tar.gz)
 TERMUX_PKG_RM_AFTER_INSTALL="share/gc"
diff --git a/packages/libgc/include-private-gcconfig.h.patch b/packages/libgc/include-private-gcconfig.h.patch
new file mode 100644
index 000000000..f2ccafa30
--- /dev/null
+++ b/packages/libgc/include-private-gcconfig.h.patch
@@ -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
diff --git a/packages/libgc/os_dep.c.patch b/packages/libgc/os_dep.c.patch
index 574370146..5186e911b 100644
--- a/packages/libgc/os_dep.c.patch
+++ b/packages/libgc/os_dep.c.patch
@@ -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) {
diff --git a/packages/libgc/pthread_stop_world.c.patch b/packages/libgc/pthread_stop_world.c.patch
index 55ee73007..9f1a164e1 100644
--- a/packages/libgc/pthread_stop_world.c.patch
+++ b/packages/libgc/pthread_stop_world.c.patch
@@ -1,12 +1,13 @@
-diff -u -r ../gc-7.6.0/pthread_stop_world.c ./pthread_stop_world.c
---- ../gc-7.6.0/pthread_stop_world.c	2016-08-02 15:36:14.000000000 -0400
-+++ ./pthread_stop_world.c	2016-08-14 16:52:41.334806302 -0400
-@@ -365,7 +365,7 @@
- }
+diff -u -r ../gc-8.0.2/pthread_stop_world.c ./pthread_stop_world.c
+--- ../gc-8.0.2/pthread_stop_world.c	2018-12-23 21:28:41.000000000 +0000
++++ ./pthread_stop_world.c	2019-01-20 19:48:08.502759151 +0000
+@@ -502,7 +502,8 @@
  
  # ifdef USE_TKILL_ON_ANDROID
+     EXTERN_C_BEGIN
 -    extern int tkill(pid_t tid, int sig); /* from sys/linux-unistd.h */
 +    static int tkill(pid_t tid, int sig) { return tgkill(-1, tid, sig); }
++
+     EXTERN_C_END
  
      static int android_thread_kill(pid_t tid, int sig)
-     {
diff --git a/packages/zile/build.sh b/packages/zile/build.sh
index 6d060dd94..165f123a7 100755
--- a/packages/zile/build.sh
+++ b/packages/zile/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/zile/
 TERMUX_PKG_DESCRIPTION="Lightweight clone of the Emacs text editor"
 TERMUX_PKG_MAINTAINER="Iain Nicol @iainnicol"
 TERMUX_PKG_VERSION=2.4.14
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/zile/zile-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74
 TERMUX_PKG_DEPENDS="libgc, ncurses"