<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e9f48ba8719d3752218b65b6893c002d5ef7cd6a">https://github.com/macports/macports-ports/commit/e9f48ba8719d3752218b65b6893c002d5ef7cd6a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e9f48ba gcc5: libgcj compatibility with libgcc9
</span>e9f48ba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e9f48ba8719d3752218b65b6893c002d5ef7cd6a
</span>Author: Mark Mentovai <mark@chromium.org>
AuthorDate: Mon May 13 23:43:22 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> gcc5: libgcj compatibility with libgcc9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> libgcc_s.1.dylib formerly provided
</span><span style='display:block; white-space:pre;color:#404040;'> __darwin10_Unwind_FindEnclosingFunction, but this is no longer true as
</span><span style='display:block; white-space:pre;color:#404040;'> of GCC 9.1.0. This symbol is used by libgcj, and its absence causes the
</span><span style='display:block; white-space:pre;color:#404040;'> compiler gcj-mp-5 and ports that are built by gcj to abort on any
</span><span style='display:block; white-space:pre;color:#404040;'> attempted call. Provide a hidden definition in gcc5's libgcj.16.dylib
</span><span style='display:block; white-space:pre;color:#404040;'> for libgcj's own use.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> gcc5 is the most recent MacPorts GCC port to provide gcj.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58469
</span>---
lang/gcc5/Portfile | 4 +-
lang/gcc5/files/patch-gcj-unwind.diff | 78 +++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc5/Portfile b/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec6a5c6..055ce35 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup conflicts_build 1.0
</span> name gcc5
epoch 2
version 5.5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,6 +79,8 @@ post-extract {
</span> ln -s ${prefix}/libexec/isl18/include/isl ${worksrcpath}/gcc
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-gcj-unwind.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[vercmp ${xcodeversion} 10.2] >= 0} {
# https://trac.macports.org/ticket/58260
# Patch for Xcode bug, taken from
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc5/files/patch-gcj-unwind.diff b/lang/gcc5/files/patch-gcj-unwind.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d39d749
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc5/files/patch-gcj-unwind.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://trac.macports.org/ticket/58469
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libjava/posix.cc 2007-02-22 11:04:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libjava/posix.cc 2019-05-13 23:21:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,6 +10,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* libgcj doesn't normally provide this symbol. Declare it as "hidden" to make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * sure that it's only available for libgcj's own use. The declaration must come
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * before any other in order to ensure that the desired hidden visibility is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * applied. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" __attribute__ ((visibility ("hidden")))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void * _darwin10_Unwind_FindEnclosingFunction (void *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "posix.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +36,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <java/io/InterruptedIOException.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <java/util/Properties.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "unwind-dw2-fde.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined (ECOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C" unsigned long long _clock (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -248,3 +261,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ret_val;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_darwin10_Unwind_FindEnclosingFunction (void *pc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct dwarf_eh_bases bases;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const struct dwarf_fde *fde = _Unwind_Find_FDE ((void*)(((uintptr_t)pc)-1), &bases);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fde)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return bases.func;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgcc/unwind-dw2-fde.h 2015-01-22 11:22:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgcc/unwind-dw2-fde.h 2019-05-13 21:08:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef GCC_UNWIND_DW2_FDE_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GCC_UNWIND_DW2_FDE_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef HIDE_EXPORTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC visibility push(default)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +158,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline const struct dwarf_cie *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_cie (const struct dwarf_fde *f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (const void *)&f->CIE_delta - f->CIE_delta;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (const struct dwarf_cie *)((const void *)&f->CIE_delta - f->CIE_delta);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline const fde *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,4 +183,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC visibility pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* unwind-dw2-fde.h */
</span></pre><pre style='margin:0'>
</pre>