<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/af4d2ca57fa6539494fdee7e1f17fb9b963922c2">https://github.com/macports/macports-ports/commit/af4d2ca57fa6539494fdee7e1f17fb9b963922c2</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 af4d2ca libgcc and gcc7: enable build on 10.4 and 10.5 PPC
</span>af4d2ca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit af4d2ca57fa6539494fdee7e1f17fb9b963922c2
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Sep 21 11:52:21 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> libgcc and gcc7: enable build on 10.4 and 10.5 PPC
</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/54215
</span><span style='display:block; white-space:pre;color:#404040;'> no revbump: changes do not affect build on systems
</span><span style='display:block; white-space:pre;color:#404040;'> that currently can build libgcc and gcc7
</span>---
lang/gcc7/Portfile | 4 +
.../files/patch-darwin-ppc-2017-01-msg02971.diff | 223 +++++++++++++++++++++
2 files changed, 227 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc7/Portfile b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e8d81c7..b4d95a3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,6 +51,10 @@ platform darwin {
</span>
# see https://gcc.gnu.org/ml/gcc-patches/2012-05/msg00672.html
patchfiles-append patch-float128.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # enable build on 10.4 and 10.5 PPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/54215
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-darwin-ppc-2017-01-msg02971.diff
</span> }
configure.dir ${workpath}/build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc7/files/patch-darwin-ppc-2017-01-msg02971.diff b/lang/gcc7/files/patch-darwin-ppc-2017-01-msg02971.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e9ec101
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc7/files/patch-darwin-ppc-2017-01-msg02971.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,223 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gcc.gnu.org/ml/gcc-testresults/2017-01/msg02971.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e28e7068641a9ef7d1899b474fa3ddf898edc4c2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@codesourcery.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 2 Dec 2016 12:29:23 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/4] [Darwin, powerpc] Fix bootstrap (PR77359) by copying AIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ amendment.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PowerPC Darwin also requires 128b stack alignment (for all versions I currently have access to). It's quite possible that it would be suitable to #define STACK_BOUNDARY 128, but for now I've left it as defined in rs6000.h.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc/config/rs6000/darwin.h | 31 ++++++++++++++++++++++++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 26 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 397ab1c..72c71f6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gcc/config/rs6000/darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gcc/config/rs6000/darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,19 +146,40 @@ extern int darwin_emit_branch_islands;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef RS6000_PIC_OFFSET_TABLE_REGNUM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RS6000_PIC_OFFSET_TABLE_REGNUM 31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Pad the outgoing args area to 16 bytes instead of the usual 8. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Offset within stack frame to start allocating local variables at.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ If FRAME_GROWS_DOWNWARD, this is the offset to the END of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ first local allocated. Otherwise, it is the offset to the BEGINNING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ of the first local allocated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ On the RS/6000, the frame pointer is the same as the stack pointer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ except for dynamic allocations. So we start after the fixed area and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ outgoing parameter area.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ If the function uses dynamic stack space (CALLS_ALLOCA is set), that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ space needs to be aligned to STACK_BOUNDARY, i.e. the sum of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sizes of the fixed area and the parameter area must be a multiple of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STACK_BOUNDARY. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef STARTING_FRAME_OFFSET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STARTING_FRAME_OFFSET \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (FRAME_GROWS_DOWNWARD \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ? 0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : (RS6000_ALIGN (crtl->outgoing_args_size, 16) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- + RS6000_SAVE_AREA))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : (cfun->calls_alloca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ? RS6000_ALIGN (crtl->outgoing_args_size + RS6000_SAVE_AREA, 16) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : (RS6000_ALIGN (crtl->outgoing_args_size, 16) + RS6000_SAVE_AREA)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Offset from the stack pointer register to an item dynamically
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ allocated on the stack, e.g., by `alloca'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ The default value for this macro is `STACK_POINTER_OFFSET' plus the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ length of the outgoing arguments. The default is correct for most
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ machines. See `function.c' for details.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ This value must be a multiple of STACK_BOUNDARY (hard coded in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ `emit-rtl.c'). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef STACK_DYNAMIC_OFFSET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STACK_DYNAMIC_OFFSET(FUNDECL) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (RS6000_ALIGN (crtl->outgoing_args_size, 16) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- + (STACK_POINTER_OFFSET))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RS6000_ALIGN (crtl->outgoing_args_size + STACK_POINTER_OFFSET, 16)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Darwin uses a function call if everything needs to be saved/restored. */
</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;'>+2.8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8bcf01a06f997580088a8a7d69ce16b881187dfb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@codesourcery.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 31 Aug 2016 19:45:18 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/4] [Darwin,PPC] Remove uses of LR in restore_world.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+r 239866 removed most of the uses of LR in returns and subclass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Darwin had an additional use of LR in the restore_world machinery. This patch removes it from the pattern in altivec.md and the relevant predicate.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2016-12-11 Iain Sandoe <iain@codesourcery.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * config/rs6000/altivec.md (*restore_world): Remove LR use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * config/rs6000/predicates.md (restore_world_operation): Adjust op
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ count, remove one USE.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc/config/rs6000/altivec.md | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc/config/rs6000/predicates.md | 3 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 1 insertion(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gcc/config/rs6000/altivec.md b/gcc/config/rs6000/altivec.md
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8af7ac5..60fc983 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gcc/config/rs6000/altivec.md
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gcc/config/rs6000/altivec.md
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -414,7 +414,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (define_insn "*restore_world"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [(match_parallel 0 "restore_world_operation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [(return)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (use (reg:SI LR_REGNO))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (use (match_operand:SI 1 "call_operand" "s"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (clobber (match_operand:SI 2 "gpc_reg_operand" "=r"))])]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "TARGET_MACHO && (DEFAULT_ABI == ABI_DARWIN) && TARGET_32BIT"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3d69fc8..8f568a7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gcc/config/rs6000/predicates.md
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gcc/config/rs6000/predicates.md
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1468,13 +1468,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rtx elt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int count = XVECLEN (op, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (count != 59)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (count != 58)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ index = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (GET_CODE (XVECEXP (op, 0, index++)) != RETURN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || GET_CODE (XVECEXP (op, 0, index++)) != USE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- || GET_CODE (XVECEXP (op, 0, index++)) != USE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || GET_CODE (XVECEXP (op, 0, index++)) != CLOBBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</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;'>+2.8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7abddda25c5d3ee568cd72477cfca89a1b3baceb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@codesourcery.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 27 Nov 2016 15:48:23 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/4] [Darwin PPC] Fix Fortran bootstrap by fixing ppc/setjmp.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Earlier Darwin headers do not declare longjmp as noreturn, this was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+already fixed for i386, but also affects the powerpc port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2016-11-27 Iain Sandoe <iain@codesourcery.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PR bootstrap/72833
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * inclhack.def (darwin_longjmp_noreturn): Amend to add ppc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * fixincl.x: Regenerated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fixincludes/fixincl.x | 10 +++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fixincludes/inclhack.def | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 7 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6a010d6..8567828 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fixincludes/fixincl.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/fixincl.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2753,7 +2753,7 @@ tSCC zDarwin_Longjmp_NoreturnName[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * File name selection pattern
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tSCC zDarwin_Longjmp_NoreturnList[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "i386/setjmp.h\0";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "i386/setjmp.h\0ppc/setjmp.h\0";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Machine/OS name selection pattern
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 03a267b..6cf056c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fixincludes/inclhack.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fixincludes/inclhack.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1421,12 +1421,13 @@ fix = {
</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;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Before Mac OS X 10.8 <i386/setjmp.h> doesn't mark longjump noreturn.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Before Mac OS X 10.8 <{i386,ppc}/setjmp.h> don't mark longjump noreturn.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hackname = darwin_longjmp_noreturn;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mach = "*-*-darwin*";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ files = "i386/setjmp.h";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ files = "ppc/setjmp.h";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bypass = "__dead2";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select = "(.*longjmp\\(.*jmp_buf.*[^)]+\\));";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c_fix = format;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From de5187a1258e4ac036f5b787d921d5e69c4fc476 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@codesourcery.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 18 Jun 2016 14:39:50 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 4/4] Update of __gnat_lwp_self(), with fixes for Darwin9.
</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;'>+ gcc/ada/adaint.c | 14 +++++++++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 11 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 54a1d6e..0af8ca4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gcc/ada/adaint.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gcc/ada/adaint.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3174,9 +3174,13 @@ __gnat_lwp_self (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;'>+ #if defined (__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <mach/thread_info.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <mach/mach_init.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <mach/thread_act.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <mach/thread_info.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <mach/mach_init.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <mach/thread_act.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <pthread.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;'>+ /* System-wide thread identifier. Note it could be truncated on 32 bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hosts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3184,6 +3188,7 @@ __gnat_lwp_self (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __gnat_lwp_self (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ thread_identifier_info_data_t data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mach_msg_type_number_t count = THREAD_IDENTIFIER_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kern_return_t kret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3194,6 +3199,9 @@ __gnat_lwp_self (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (void *)(uintptr_t)data.thread_id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (void *)pthread_mach_thread_np (pthread_self ());
</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
</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;'>+2.8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>