diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2019-11-19 17:45:20 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2019-11-19 17:55:53 +0300 |
commit | 11890f1485f765e1e6fcef56ec32d5b0c0ebfb18 (patch) | |
tree | 12655510ca2bda2825ea957a90af0d67ddb37662 | |
parent | 03bebac19e6fef19299d7326d3ee41f8a7dd1316 (diff) | |
download | gcc-9-11890f1485f765e1e6fcef56ec32d5b0c0ebfb18.tar.gz |
Remove obsolete Dyson patches
Java is gone.
Cilk is gone.
-rw-r--r-- | debian/patches/illumos-boehm-gc.diff | 40 | ||||
-rw-r--r-- | debian/patches/illumos-sysdep-unix.c.diff | 16 | ||||
-rw-r--r-- | debian/patches/illumos-use_libgcj_bc.diff | 13 | ||||
-rw-r--r-- | debian/rules.patch | 3 |
4 files changed, 0 insertions, 72 deletions
diff --git a/debian/patches/illumos-boehm-gc.diff b/debian/patches/illumos-boehm-gc.diff deleted file mode 100644 index e8ec1f5..0000000 --- a/debian/patches/illumos-boehm-gc.diff +++ /dev/null @@ -1,40 +0,0 @@ -Description: changes to libgcj.ver fix crashes of programs using boehm-gc. - Defining SOLARIS_STACKBOTTOM makes use of a native way to get stack bottom - (with thr_stksegment()) -Index: gcc-49/src/boehm-gc/include/private/gcconfig.h -=================================================================== ---- gcc-49.orig/src/boehm-gc/include/private/gcconfig.h -+++ gcc-49/src/boehm-gc/include/private/gcconfig.h -@@ -2114,7 +2114,7 @@ - /* HEURISTIC2 probably works, but this appears to be preferable. */ - /* # include <sys/vm.h> */ - /* # define STACKBOTTOM USRSTACK */ --# define HEURISTIC2 -+# define SOLARIS_STACKBOTTOM - # define PROC_VDB - # define DYNAMIC_LOADING - # if !defined(USE_MMAP) && defined(REDIRECT_MALLOC) -Index: gcc-49/src/libjava/libgcj.ver -=================================================================== ---- gcc-49.orig/src/libjava/libgcj.ver -+++ gcc-49/src/libjava/libgcj.ver -@@ -9,6 +9,19 @@ - __gcj_personality_sj0; - __gcj_personality_seh0; - _Z*; -+ -+# https://sourceware.org/ml/binutils/2010-02/msg00457.html -+# Otherwise boehm-gc cannot determine memory borders -+# and Java executables randomly crash -+# GNU ld add these symbols by default, but not in case -+# when version script is specified. -+ _GLOBAL_OFFSET_TABLE_; -+ _etext; -+ _DYNAMIC; -+ _edata; -+ _end; -+ _PROCEDURE_LINKAGE_TABLE_; -+ - local: - *; - }; diff --git a/debian/patches/illumos-sysdep-unix.c.diff b/debian/patches/illumos-sysdep-unix.c.diff deleted file mode 100644 index 53506c9..0000000 --- a/debian/patches/illumos-sysdep-unix.c.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: gcc-5/src/libcilkrts/runtime/sysdep-unix.c -=================================================================== ---- gcc-5.orig/src/libcilkrts/runtime/sysdep-unix.c -+++ gcc-5/src/libcilkrts/runtime/sysdep-unix.c -@@ -46,6 +46,11 @@ - # define _GNU_SOURCE - #endif - -+#ifdef __sun__ -+# define _GNU_SOURCE -+# define __EXTENSIONS__ -+#endif -+ - #include "sysdep.h" - #include "os.h" - #include "bug.h" diff --git a/debian/patches/illumos-use_libgcj_bc.diff b/debian/patches/illumos-use_libgcj_bc.diff deleted file mode 100644 index a1878bd..0000000 --- a/debian/patches/illumos-use_libgcj_bc.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: gcc-5/src/libjava/configure.host -=================================================================== ---- gcc-5.orig/src/libjava/configure.host -+++ gcc-5/src/libjava/configure.host -@@ -413,7 +413,7 @@ case "${host}" in - esac - - case "${host}" in -- *linux*|*-kfreebsd*-gnu|*-gnu*) -+ *linux*|*-kfreebsd*-gnu|*-gnu*|*solaris*) - use_libgcj_bc=yes - ;; - *) diff --git a/debian/rules.patch b/debian/rules.patch index 02695ec..7c1e108 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -270,13 +270,10 @@ debian_patches += ada-changes-in-autogen-output ifeq ($(DEB_TARGET_ARCH_OS), illumos) debian_patches += illumos-multiarch debian_patches += illumos-spec - debian_patches += illumos-use_libgcj_bc debian_patches += illumos-pragma-align debian_patches += illumos-fclone-functions debian_patches += illumos-strict-calling-conventions - debian_patches += illumos-boehm-gc debian_patches += illumos-libgcc-regs - debian_patches += illumos-sysdep-unix.c endif series_stamp = $(stampdir)/02-series-stamp |