From 232fa4e15cc3abab1ccf10ee4d5336d3e03b91db Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 9 Dec 2018 19:11:49 +0100
Subject: [PATCH] - updated to 6.5.0 - added c++98 patch (fix build in non-dual
 ABI mode)

---
 crossmingw64-gcc.spec |  8 +++++---
 gcc-c++98.patch       | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 gcc-c++98.patch

diff --git a/crossmingw64-gcc.spec b/crossmingw64-gcc.spec
index 9162732..8e75b3e 100644
--- a/crossmingw64-gcc.spec
+++ b/crossmingw64-gcc.spec
@@ -9,21 +9,22 @@ Summary(pl.UTF-8):	Skrośne narzędzia programistyczne GNU dla MinGW-W64 - gcc
 Summary(pt_BR.UTF-8):	Utilitários para desenvolvimento de binários da GNU - MinGW-W64 gcc
 Summary(tr.UTF-8):	GNU geliştirme araçları - MinGW-W64 gcc
 Name:		crossmingw64-gcc
-Version:	6.4.0
+Version:	6.5.0
 Release:	1
 Epoch:		1
 License:	GPL v3+
 Group:		Development/Languages
 Source0:	https://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.xz
-# Source0-md5:	11ba51a0cfb8471927f387c8895fe232
+# Source0-md5:	edaeff1cc020b16a0c19a6d5e80dc2fd
 # svn co https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/stable/v2.x/mingw-w64-crt mingw64-crt
 %define		_rev	5515
 Source1:	mingw64-crt.tar.xz
 # Source1-md5:	bf9051e7e4deb445e9e8877ca68211e1
 Patch0:		gcc-branch.diff
-# Patch0-md5:	1d4bc26154e47de7d727d6767215e776
+# Patch0-md5:	5ad5a566cbaf57f985192534e5ef1c32
 Patch1:		gcc-mingw-dirs.patch
 Patch2:		gcc-mingw64.patch
+Patch3:		gcc-c++98.patch
 URL:		http://mingw-w64.sourceforge.net/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.11.1
@@ -195,6 +196,7 @@ libstdc++ 64-bit DLL library for Windows.
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # override snapshot version.
 echo %{version} > gcc/BASE-VER
diff --git a/gcc-c++98.patch b/gcc-c++98.patch
new file mode 100644
index 0000000..aa87555
--- /dev/null
+++ b/gcc-c++98.patch
@@ -0,0 +1,22 @@
+--- gcc-6.5.0/libstdc++-v3/src/c++98/ios_failure.cc.orig	2018-08-08 17:40:11.000000000 +0200
++++ gcc-6.5.0/libstdc++-v3/src/c++98/ios_failure.cc	2018-12-09 18:36:29.106481145 +0100
+@@ -122,13 +122,16 @@
+     // Otherwise proceeed as normal to see if the handler matches.
+     return __class_type_info::__do_upcast(dst_type, obj_ptr);
+   }
+-#else // _GLIBCXX_USE_DUAL_ABI && __cpp_rtti
+-  using __iosfailure = ios::failure;
+-#endif
+ 
+   void
+   __throw_ios_failure(const char* __s __attribute__((unused)))
+   { _GLIBCXX_THROW_OR_ABORT(__iosfailure(_(__s))); }
++#else // _GLIBCXX_USE_DUAL_ABI && __cpp_rtti
++
++  void
++  __throw_ios_failure(const char* __s __attribute__((unused)))
++  { _GLIBCXX_THROW_OR_ABORT(ios::failure(_(__s))); }
++#endif
+ 
+ _GLIBCXX_END_NAMESPACE_VERSION
+ } // namespace
-- 
2.44.0