From ab9531a18f13bf665ebeb7d762afa30d7badadbd Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Thu, 14 May 2020 19:18:54 +0000
Subject: Don't mess up <exception> with abort() hack, just include it always
 before doing the latter.

---
 lang/gcc49/distinfo                   |  5 +++--
 lang/gcc49/patches/patch-gcc_system.h | 13 +++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'lang/gcc49')

diff --git a/lang/gcc49/distinfo b/lang/gcc49/distinfo
index e5c4622477d..4f27007a137 100644
--- a/lang/gcc49/distinfo
+++ b/lang/gcc49/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2019/08/06 06:16:15 maya Exp $
+$NetBSD: distinfo,v 1.17 2020/05/14 19:18:54 joerg Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -25,10 +25,11 @@ SHA1 (patch-gcc_configure) = b925cb971ec547a9c25b518927493a168391d7da
 SHA1 (patch-gcc_fortran_f95-lang.c) = 9dbac16c146821eed9b06e1e9f0da85ff5c4ee75
 SHA1 (patch-gcc_ggc-common.c) = fa577bc25260d7e6304f166686ba51c0b677d7f6
 SHA1 (patch-gcc_ginclude_stddef.h) = d1141d2f8b0e4975bbcf90c84836f410e65d39bc
-SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
+SHA1 (patch-gcc_system.h) = 078d3835c80e4cf33b4543f1e578fd9fb81828a5
 SHA1 (patch-gcc_targhooks.c) = ac5bf5f201389f5bb79866d9e0dc93ee28af51f2
 SHA1 (patch-include_libiberty.h) = 5254c6a421ae16c71571820f6f07906367f042ba
 SHA1 (patch-libcilkrts_runtime_os-unix.c) = 165e736decbc6e0e3d905d418d71cf4873927925
+SHA1 (patch-libcilkrts_runtime_signal__node.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-libcilkrts_runtime_signal_node.c) = e12fd7c9f109db568c46e915bd1bae28fae7b95a
 SHA1 (patch-libgcc_config.host) = c929bfbd17fcef36ec4f0eeebf27ceca7060d24c
 SHA1 (patch-libgcc_config_i386_dragonfly-unwind.h) = 5a7b12ece06cd7ad44191ea803ba703bd1464cb8
diff --git a/lang/gcc49/patches/patch-gcc_system.h b/lang/gcc49/patches/patch-gcc_system.h
index 9996b148df7..89720f6abfc 100644
--- a/lang/gcc49/patches/patch-gcc_system.h
+++ b/lang/gcc49/patches/patch-gcc_system.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-gcc_system.h,v 1.1 2014/09/10 12:20:00 joerg Exp $
+$NetBSD: patch-gcc_system.h,v 1.2 2020/05/14 19:18:54 joerg Exp $
 
---- gcc/system.h.orig	2013-04-29 18:37:29.000000000 +0000
+--- gcc/system.h.orig	2014-01-02 22:23:26.000000000 +0000
 +++ gcc/system.h
 @@ -72,18 +72,22 @@ along with GCC; see the file COPYING3.  
  
@@ -25,3 +25,12 @@ $NetBSD: patch-gcc_system.h,v 1.1 2014/09/10 12:20:00 joerg Exp $
  # ifdef HAVE_GETCHAR_UNLOCKED
  #  undef getchar
  #  define getchar() getchar_unlocked ()
+@@ -467,6 +471,8 @@ extern char *stpcpy (char *, const char 
+ #endif
+ 
+ #ifdef __cplusplus
++// Avoid messing with abort() use in libc++
++#include <exception>
+ extern "C" {
+ #endif
+ 
-- 
cgit v1.2.3