From d97c0c0d7deec6bb5a8177b298b347c2b431e7d5 Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Sat, 7 Oct 2017 00:47:00 -0400 Subject: [PATCH] gcc 6.4.0 Update to latest version with patches from CygWin. --- gcc/0028-g++-time.patch | 8 +- gcc/0130-libstdc++-in-out.patch | 576 ++++++++++++++++---------------- gcc/PKGBUILD | 113 ++++--- 3 files changed, 360 insertions(+), 337 deletions(-) diff --git a/gcc/0028-g++-time.patch b/gcc/0028-g++-time.patch index b0c5a788..50299d8f 100644 --- a/gcc/0028-g++-time.patch +++ b/gcc/0028-g++-time.patch @@ -1,7 +1,7 @@ This was just a bit outdated... ---- gcc-5.3.0/libstdc++-v3/acinclude.m4 2015-11-24 07:25:07.000000000 -0600 -+++ gcc-5.3.0/libstdc++-v3/acinclude.m4 2016-04-01 00:21:40.077426000 -0500 +--- origsrc/gcc-5.3.0/libstdc++-v3/acinclude.m4 2015-11-24 07:25:07.000000000 -0600 ++++ src/gcc-5.3.0/libstdc++-v3/acinclude.m4 2016-04-01 00:21:40.077426000 -0500 @@ -1196,7 +1196,10 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME] case "${target_os}" in @@ -13,8 +13,8 @@ This was just a bit outdated... ;; darwin*) ac_has_nanosleep=yes ---- gcc-5.3.0/libstdc++-v3/configure 2016-03-31 21:24:38.558164300 -0500 -+++ gcc-5.3.0/libstdc++-v3/configure 2016-04-01 00:26:14.110723800 -0500 +--- origsrc/gcc-5.3.0/libstdc++-v3/configure 2016-03-31 21:24:38.558164300 -0500 ++++ src/gcc-5.3.0/libstdc++-v3/configure 2016-04-01 00:26:14.110723800 -0500 @@ -19632,7 +19632,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu case "${target_os}" in diff --git a/gcc/0130-libstdc++-in-out.patch b/gcc/0130-libstdc++-in-out.patch index c47b7600..1038818a 100644 --- a/gcc/0130-libstdc++-in-out.patch +++ b/gcc/0130-libstdc++-in-out.patch @@ -14,10 +14,10 @@ The GCC maintainers have been notified: https://gcc.gnu.org/ml/gcc-help/2017-05/msg00121.html -diff -ur gcc-6.3.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h gcc-6.3.0/libstdc++-v3/config/locale/dragonfly/c_locale.h ---- gcc-6.3.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h 2017-05-14 09:37:13.366674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/config/locale/dragonfly/c_locale.h 2017-05-14 09:56:41.230007999 -0700 -@@ -55,7 +55,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h gcc-6.4.0/libstdc++-v3/config/locale/dragonfly/c_locale.h +--- gcc-6.4.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/config/locale/dragonfly/c_locale.h 2017-09-29 21:27:25.064191200 -0400 +@@ -55,7 +55,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // fall back to the unsafe vsprintf which, in general, can be dangerous // and should be avoided. inline int @@ -26,7 +26,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h gcc-6.3. const int __size __attribute__ ((__unused__)), const char* __fmt, ...) { -@@ -65,9 +65,9 @@ +@@ -65,9 +65,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __builtin_va_start(__args, __fmt); #if _GLIBCXX_USE_C99_STDIO @@ -38,10 +38,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h gcc-6.3. #endif __builtin_va_end(__args); -diff -ur gcc-6.3.0-orig/libstdc++-v3/config/locale/generic/c_locale.h gcc-6.3.0/libstdc++-v3/config/locale/generic/c_locale.h ---- gcc-6.3.0-orig/libstdc++-v3/config/locale/generic/c_locale.h 2017-05-14 09:37:13.366674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/config/locale/generic/c_locale.h 2017-05-14 09:56:41.230007999 -0700 -@@ -53,7 +53,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/config/locale/generic/c_locale.h gcc-6.4.0/libstdc++-v3/config/locale/generic/c_locale.h +--- gcc-6.4.0-orig/libstdc++-v3/config/locale/generic/c_locale.h 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/config/locale/generic/c_locale.h 2017-09-29 21:27:25.071691900 -0400 +@@ -53,7 +53,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // fall back to the unsafe vsprintf which, in general, can be dangerous // and should be avoided. inline int @@ -50,7 +50,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/config/locale/generic/c_locale.h gcc-6.3.0/ const int __size __attribute__((__unused__)), const char* __fmt, ...) { -@@ -71,9 +71,9 @@ +@@ -71,9 +71,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __builtin_va_start(__args, __fmt); #if _GLIBCXX_USE_C99_STDIO @@ -62,10 +62,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/config/locale/generic/c_locale.h gcc-6.3.0/ #endif __builtin_va_end(__args); -diff -ur gcc-6.3.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h gcc-6.3.0/libstdc++-v3/config/locale/gnu/c_locale.h ---- gcc-6.3.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h 2017-05-14 09:37:13.366674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/config/locale/gnu/c_locale.h 2017-05-14 09:56:41.230007999 -0700 -@@ -67,7 +67,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h gcc-6.4.0/libstdc++-v3/config/locale/gnu/c_locale.h +--- gcc-6.4.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/config/locale/gnu/c_locale.h 2017-09-29 21:27:25.079193400 -0400 +@@ -67,7 +67,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // and should be avoided. inline int __convert_from_v(const __c_locale& __cloc __attribute__ ((__unused__)), @@ -74,7 +74,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h gcc-6.3.0/libs const int __size __attribute__ ((__unused__)), const char* __fmt, ...) { -@@ -89,9 +89,9 @@ +@@ -89,9 +89,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __builtin_va_start(__args, __fmt); #if _GLIBCXX_USE_C99_STDIO @@ -86,10 +86,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h gcc-6.3.0/libs #endif __builtin_va_end(__args); -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.h gcc-6.3.0/libstdc++-v3/include/bits/basic_string.h ---- gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.h 2017-05-14 09:37:13.596674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/bits/basic_string.h 2017-05-14 09:56:41.210007999 -0700 -@@ -5384,13 +5384,13 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/bits/basic_string.h gcc-6.4.0/libstdc++-v3/include/bits/basic_string.h +--- gcc-6.4.0-orig/libstdc++-v3/include/bits/basic_string.h 2017-02-01 07:12:28.194067000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/bits/basic_string.h 2017-09-29 21:27:24.739650200 -0400 +@@ -5399,13 +5399,13 @@ _GLIBCXX_END_NAMESPACE_CXX11 template<> basic_istream& @@ -105,10 +105,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.h gcc-6.3.0/libst wchar_t __delim); #endif -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.3.0/libstdc++-v3/include/bits/basic_string.tcc ---- gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc 2017-05-14 09:37:13.593341333 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/bits/basic_string.tcc 2017-05-14 09:56:41.210007999 -0700 -@@ -1434,7 +1434,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.4.0/libstdc++-v3/include/bits/basic_string.tcc +--- gcc-6.4.0-orig/libstdc++-v3/include/bits/basic_string.tcc 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/bits/basic_string.tcc 2017-09-29 21:27:24.753651800 -0400 +@@ -1434,7 +1434,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // 21.3.7.9 basic_string::getline and operators template basic_istream<_CharT, _Traits>& @@ -117,7 +117,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.3.0/lib basic_string<_CharT, _Traits, _Alloc>& __str) { typedef basic_istream<_CharT, _Traits> __istream_type; -@@ -1447,7 +1447,7 @@ +@@ -1447,7 +1447,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __size_type __extracted = 0; typename __ios_base::iostate __err = __ios_base::goodbit; @@ -126,7 +126,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.3.0/lib if (__cerb) { __try -@@ -1456,12 +1456,12 @@ +@@ -1456,12 +1456,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __str.erase(); _CharT __buf[128]; __size_type __len = 0; @@ -142,7 +142,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.3.0/lib while (__extracted < __n && !_Traits::eq_int_type(__c, __eof) -@@ -1475,17 +1475,17 @@ +@@ -1475,17 +1475,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } __buf[__len++] = _Traits::to_char_type(__c); ++__extracted; @@ -163,7 +163,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.3.0/lib __throw_exception_again; } __catch(...) -@@ -1493,20 +1493,20 @@ +@@ -1493,20 +1493,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // _GLIBCXX_RESOLVE_LIB_DEFECTS // 91. Description of operator>> and getline() for string<> // might cause endless loop @@ -188,7 +188,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.3.0/lib basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim) { typedef basic_istream<_CharT, _Traits> __istream_type; -@@ -1518,7 +1518,7 @@ +@@ -1518,7 +1518,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __size_type __extracted = 0; const __size_type __n = __str.max_size(); typename __ios_base::iostate __err = __ios_base::goodbit; @@ -197,7 +197,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.3.0/lib if (__cerb) { __try -@@ -1526,7 +1526,7 @@ +@@ -1526,7 +1526,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __str.erase(); const __int_type __idelim = _Traits::to_int_type(__delim); const __int_type __eof = _Traits::eof(); @@ -206,7 +206,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.3.0/lib while (__extracted < __n && !_Traits::eq_int_type(__c, __eof) -@@ -1534,7 +1534,7 @@ +@@ -1534,7 +1534,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { __str += _Traits::to_char_type(__c); ++__extracted; @@ -215,7 +215,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.3.0/lib } if (_Traits::eq_int_type(__c, __eof)) -@@ -1542,14 +1542,14 @@ +@@ -1542,14 +1542,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION else if (_Traits::eq_int_type(__c, __idelim)) { ++__extracted; @@ -232,7 +232,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.3.0/lib __throw_exception_again; } __catch(...) -@@ -1557,14 +1557,14 @@ +@@ -1557,14 +1557,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // _GLIBCXX_RESOLVE_LIB_DEFECTS // 91. Description of operator>> and getline() for string<> // might cause endless loop @@ -250,10 +250,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-6.3.0/lib } // Inhibit implicit instantiations for required instantiations, -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-6.3.0/libstdc++-v3/include/bits/istream.tcc ---- gcc-6.3.0-orig/libstdc++-v3/include/bits/istream.tcc 2017-05-14 09:37:13.593341333 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/bits/istream.tcc 2017-05-14 09:56:41.213341333 -0700 -@@ -44,20 +44,20 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-6.4.0/libstdc++-v3/include/bits/istream.tcc +--- gcc-6.4.0-orig/libstdc++-v3/include/bits/istream.tcc 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/bits/istream.tcc 2017-09-29 21:27:24.765153800 -0400 +@@ -44,20 +44,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template basic_istream<_CharT, _Traits>::sentry:: @@ -281,7 +281,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-6.3.0/libstdc+ while (!traits_type::eq_int_type(__c, __eof) && __ct.is(ctype_base::space, traits_type::to_char_type(__c))) -@@ -71,12 +71,12 @@ +@@ -71,12 +71,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } @@ -296,7 +296,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-6.3.0/libstdc+ } } -@@ -920,18 +920,18 @@ +@@ -920,18 +920,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // 27.6.1.2.3 Character extraction templates template basic_istream<_CharT, _Traits>& @@ -318,7 +318,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-6.3.0/libstdc+ if (!_Traits::eq_int_type(__cb, _Traits::eof())) __c = _Traits::to_char_type(__cb); else -@@ -939,20 +939,20 @@ +@@ -939,20 +939,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } __catch(__cxxabiv1::__forced_unwind&) { @@ -344,7 +344,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-6.3.0/libstdc+ { typedef basic_istream<_CharT, _Traits> __istream_type; typedef basic_streambuf<_CharT, _Traits> __streambuf_type; -@@ -962,20 +962,20 @@ +@@ -962,20 +962,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION streamsize __extracted = 0; ios_base::iostate __err = ios_base::goodbit; @@ -369,7 +369,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-6.3.0/libstdc+ int_type __c = __sb->sgetc(); while (__extracted < __num - 1 -@@ -993,36 +993,36 @@ +@@ -993,36 +993,36 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // _GLIBCXX_RESOLVE_LIB_DEFECTS // 68. Extractors for char* should store null at end *__s = char_type(); @@ -414,7 +414,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-6.3.0/libstdc+ __int_type __c = __sb->sgetc(); while (!_Traits::eq_int_type(__c, __eof) -@@ -1030,8 +1030,8 @@ +@@ -1030,8 +1030,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __c = __sb->snextc(); if (_Traits::eq_int_type(__c, __eof)) @@ -425,10 +425,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-6.3.0/libstdc+ } // Inhibit implicit instantiations for required instantiations, -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_conv.h gcc-6.3.0/libstdc++-v3/include/bits/locale_conv.h ---- gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_conv.h 2017-05-14 09:37:13.596674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/bits/locale_conv.h 2017-05-14 09:56:41.216674666 -0700 -@@ -246,10 +246,10 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/bits/locale_conv.h gcc-6.4.0/libstdc++-v3/include/bits/locale_conv.h +--- gcc-6.4.0-orig/libstdc++-v3/include/bits/locale_conv.h 2017-06-16 10:09:36.592725000 -0400 ++++ gcc-6.4.0/libstdc++-v3/include/bits/locale_conv.h 2017-09-29 21:27:24.774654300 -0400 +@@ -249,10 +249,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 { if (!_M_with_cvtstate) _M_state = state_type(); @@ -442,7 +442,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_conv.h gcc-6.3.0/libstd if (_M_with_strings) return _M_wide_err_string; __throw_range_error("wstring_convert::from_bytes"); -@@ -282,10 +282,10 @@ +@@ -285,10 +285,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 { if (!_M_with_cvtstate) _M_state = state_type(); @@ -456,8 +456,8 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_conv.h gcc-6.3.0/libstd if (_M_with_strings) return _M_byte_err_string; __throw_range_error("wstring_convert::to_bytes"); -@@ -375,13 +375,13 @@ - { return _M_buf && _M_conv_put() && _M_buf->pubsync() ? 0 : -1; } +@@ -378,13 +378,13 @@ _GLIBCXX_END_NAMESPACE_CXX11 + { return _M_buf && _M_conv_put() && !_M_buf->pubsync() ? 0 : -1; } typename _Wide_streambuf::int_type - overflow(typename _Wide_streambuf::int_type __out) @@ -474,10 +474,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_conv.h gcc-6.3.0/libstd } typename _Wide_streambuf::int_type -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-6.3.0/libstdc++-v3/include/bits/locale_facets.h ---- gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_facets.h 2017-05-14 09:37:13.593341333 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/bits/locale_facets.h 2017-05-14 09:56:41.213341333 -0700 -@@ -1984,7 +1984,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-6.4.0/libstdc++-v3/include/bits/locale_facets.h +--- gcc-6.4.0-orig/libstdc++-v3/include/bits/locale_facets.h 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/bits/locale_facets.h 2017-09-29 21:27:24.793156900 -0400 +@@ -1984,7 +1984,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL * except if the value is 1, sets @a v to true, if the value is 0, sets * @a v to false, and otherwise set err to ios_base::failbit. * @@ -486,7 +486,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-6.3.0/libs * @param __end End of input stream. * @param __io Source of locale and flags. * @param __err Error flags to set. -@@ -1992,9 +1992,9 @@ +@@ -1992,9 +1992,9 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL * @return Iterator after reading. */ iter_type @@ -498,7 +498,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-6.3.0/libs //@{ /** -@@ -2021,7 +2021,7 @@ +@@ -2021,7 +2021,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL * Otherwise, sets err to ios_base::failbit and leaves @a v unaltered. * Sets err to ios_base::eofbit if the stream is emptied. * @@ -507,7 +507,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-6.3.0/libs * @param __end End of input stream. * @param __io Source of locale and flags. * @param __err Error flags to set. -@@ -2029,35 +2029,35 @@ +@@ -2029,35 +2029,35 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL * @return Iterator after reading. */ iter_type @@ -555,7 +555,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-6.3.0/libs #endif //@} -@@ -2081,7 +2081,7 @@ +@@ -2081,7 +2081,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL * Otherwise, sets err to ios_base::failbit and leaves @a v unaltered. * Sets err to ios_base::eofbit if the stream is emptied. * @@ -564,7 +564,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-6.3.0/libs * @param __end End of input stream. * @param __io Source of locale and flags. * @param __err Error flags to set. -@@ -2089,19 +2089,19 @@ +@@ -2089,19 +2089,19 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL * @return Iterator after reading. */ iter_type @@ -590,7 +590,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-6.3.0/libs //@} /** -@@ -2124,7 +2124,7 @@ +@@ -2124,7 +2124,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL * Otherwise, sets err to ios_base::failbit and leaves @a v unaltered. * Sets err to ios_base::eofbit if the stream is emptied. * @@ -599,7 +599,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-6.3.0/libs * @param __end End of input stream. * @param __io Source of locale and flags. * @param __err Error flags to set. -@@ -2132,9 +2132,9 @@ +@@ -2132,9 +2132,9 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL * @return Iterator after reading. */ iter_type @@ -611,10 +611,50 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-6.3.0/libs protected: /// Destructor. -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/ostream_insert.h gcc-6.3.0/libstdc++-v3/include/bits/ostream_insert.h ---- gcc-6.3.0-orig/libstdc++-v3/include/bits/ostream_insert.h 2017-05-14 09:37:13.596674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/bits/ostream_insert.h 2017-05-14 09:56:41.220007999 -0700 -@@ -41,31 +41,31 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/bits/ostream.tcc gcc-6.4.0/libstdc++-v3/include/bits/ostream.tcc +--- gcc-6.4.0-orig/libstdc++-v3/include/bits/ostream.tcc 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/bits/ostream.tcc 2017-09-29 21:27:24.803158300 -0400 +@@ -318,10 +318,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + template + basic_ostream<_CharT, _Traits>& +- operator<<(basic_ostream<_CharT, _Traits>& __out, const char* __s) ++ operator<<(basic_ostream<_CharT, _Traits>& ___out, const char* __s) + { + if (!__s) +- __out.setstate(ios_base::badbit); ++ ___out.setstate(ios_base::badbit); + else + { + // _GLIBCXX_RESOLVE_LIB_DEFECTS +@@ -339,18 +339,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + _CharT *__ws = __pg.__get(); + for (size_t __i = 0; __i < __clen; ++__i) +- __ws[__i] = __out.widen(__s[__i]); +- __ostream_insert(__out, __ws, __clen); ++ __ws[__i] = ___out.widen(__s[__i]); ++ __ostream_insert(___out, __ws, __clen); + } + __catch(__cxxabiv1::__forced_unwind&) + { +- __out._M_setstate(ios_base::badbit); ++ ___out._M_setstate(ios_base::badbit); + __throw_exception_again; + } + __catch(...) +- { __out._M_setstate(ios_base::badbit); } ++ { ___out._M_setstate(ios_base::badbit); } + } +- return __out; ++ return ___out; + } + + // Inhibit implicit instantiations for required instantiations, +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/bits/ostream_insert.h gcc-6.4.0/libstdc++-v3/include/bits/ostream_insert.h +--- gcc-6.4.0-orig/libstdc++-v3/include/bits/ostream_insert.h 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/bits/ostream_insert.h 2017-09-29 21:27:24.811159100 -0400 +@@ -41,31 +41,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template inline void @@ -653,7 +693,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/ostream_insert.h gcc-6.3.0/lib break; } } -@@ -73,43 +73,43 @@ +@@ -73,43 +73,43 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template basic_ostream<_CharT, _Traits>& @@ -711,50 +751,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/ostream_insert.h gcc-6.3.0/lib } // Inhibit implicit instantiations for required instantiations, -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/ostream.tcc gcc-6.3.0/libstdc++-v3/include/bits/ostream.tcc ---- gcc-6.3.0-orig/libstdc++-v3/include/bits/ostream.tcc 2017-05-14 09:37:13.593341333 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/bits/ostream.tcc 2017-05-14 09:56:41.203341332 -0700 -@@ -318,10 +318,10 @@ - - template - basic_ostream<_CharT, _Traits>& -- operator<<(basic_ostream<_CharT, _Traits>& __out, const char* __s) -+ operator<<(basic_ostream<_CharT, _Traits>& ___out, const char* __s) - { - if (!__s) -- __out.setstate(ios_base::badbit); -+ ___out.setstate(ios_base::badbit); - else - { - // _GLIBCXX_RESOLVE_LIB_DEFECTS -@@ -339,18 +339,18 @@ - - _CharT *__ws = __pg.__get(); - for (size_t __i = 0; __i < __clen; ++__i) -- __ws[__i] = __out.widen(__s[__i]); -- __ostream_insert(__out, __ws, __clen); -+ __ws[__i] = ___out.widen(__s[__i]); -+ __ostream_insert(___out, __ws, __clen); - } - __catch(__cxxabiv1::__forced_unwind&) - { -- __out._M_setstate(ios_base::badbit); -+ ___out._M_setstate(ios_base::badbit); - __throw_exception_again; - } - __catch(...) -- { __out._M_setstate(ios_base::badbit); } -+ { ___out._M_setstate(ios_base::badbit); } - } -- return __out; -+ return ___out; - } - - // Inhibit implicit instantiations for required instantiations, -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.h gcc-6.3.0/libstdc++-v3/include/bits/regex.h ---- gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.h 2017-05-14 09:37:13.593341333 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/bits/regex.h 2017-05-14 09:56:41.220007999 -0700 -@@ -1777,7 +1777,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/bits/regex.h gcc-6.4.0/libstdc++-v3/include/bits/regex.h +--- gcc-6.4.0-orig/libstdc++-v3/include/bits/regex.h 2017-05-18 10:34:50.567158000 -0400 ++++ gcc-6.4.0/libstdc++-v3/include/bits/regex.h 2017-09-29 21:27:24.827661000 -0400 +@@ -1777,7 +1777,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 */ template _Out_iter @@ -763,7 +763,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.h gcc-6.3.0/libstdc++-v3 const char_type* __fmt_last, match_flag_type __flags = regex_constants::format_default) const; -@@ -1786,10 +1786,10 @@ +@@ -1786,10 +1786,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 */ template _Out_iter @@ -776,7 +776,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.h gcc-6.3.0/libstdc++-v3 __flags); } -@@ -2277,46 +2277,46 @@ +@@ -2277,46 +2277,46 @@ _GLIBCXX_END_NAMESPACE_CXX11 /** * @brief Search for a regular expression within a range for multiple times, and replace the matched parts through filling a format string. @@ -830,10 +830,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.h gcc-6.3.0/libstdc++-v3 const basic_regex<_Ch_type, _Rx_traits>& __e, const _Ch_type* __fmt, regex_constants::match_flag_type __flags -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-6.3.0/libstdc++-v3/include/bits/regex.tcc ---- gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.tcc 2017-05-14 09:37:13.596674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/bits/regex.tcc 2017-05-14 09:56:41.203341332 -0700 -@@ -357,7 +357,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-6.4.0/libstdc++-v3/include/bits/regex.tcc +--- gcc-6.4.0-orig/libstdc++-v3/include/bits/regex.tcc 2017-05-18 10:34:50.567158000 -0400 ++++ gcc-6.4.0/libstdc++-v3/include/bits/regex.tcc 2017-09-29 21:27:24.838163100 -0400 +@@ -357,7 +357,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template template _Out_iter match_results<_Bi_iter, _Alloc>:: @@ -842,7 +842,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-6.3.0/libstdc++- const match_results<_Bi_iter, _Alloc>::char_type* __fmt_first, const match_results<_Bi_iter, _Alloc>::char_type* __fmt_last, match_flag_type __flags) const -@@ -372,7 +372,7 @@ +@@ -372,7 +372,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { auto& __sub = (*this)[__idx]; if (__sub.matched) @@ -851,7 +851,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-6.3.0/libstdc++- }; if (__flags & regex_constants::format_sed) -@@ -389,10 +389,10 @@ +@@ -389,10 +389,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION && __fctyp.is(__ctype_type::digit, *__fmt_first)) __output(__traits.value(*__fmt_first++, 10)); else @@ -864,7 +864,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-6.3.0/libstdc++- } else { -@@ -402,7 +402,7 @@ +@@ -402,7 +402,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (__next == __fmt_last) break; @@ -873,7 +873,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-6.3.0/libstdc++- auto __eat = [&](char __ch) -> bool { -@@ -415,22 +415,22 @@ +@@ -415,22 +415,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION }; if (++__next == __fmt_last) @@ -900,7 +900,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-6.3.0/libstdc++- } else if (__fctyp.is(__ctype_type::digit, *__next)) { -@@ -445,18 +445,18 @@ +@@ -445,18 +445,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __output(__num); } else @@ -923,7 +923,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-6.3.0/libstdc++- const basic_regex<_Ch_type, _Rx_traits>& __e, const _Ch_type* __fmt, regex_constants::match_flag_type __flags) -@@ -467,7 +467,7 @@ +@@ -467,7 +467,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (__i == __end) { if (!(__flags & regex_constants::format_no_copy)) @@ -932,7 +932,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-6.3.0/libstdc++- } else { -@@ -476,17 +476,17 @@ +@@ -476,17 +476,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION for (; __i != __end; ++__i) { if (!(__flags & regex_constants::format_no_copy)) @@ -955,10 +955,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-6.3.0/libstdc++- } template _RandomAccessIterator __sample(_InputIterator __first, _InputIterator __last, input_iterator_tag, @@ -967,7 +967,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/experimental/algorithm gcc-6.3.0/li _Size __n, _UniformRandomNumberGenerator&& __g) { using __distrib_type = std::uniform_int_distribution<_Size>; -@@ -69,7 +69,7 @@ +@@ -69,7 +69,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Size __sample_sz = 0; while (__first != __last && __sample_sz != __n) { @@ -976,7 +976,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/experimental/algorithm gcc-6.3.0/li ++__first; } for (auto __pop_sz = __sample_sz; __first != __last; -@@ -77,9 +77,9 @@ +@@ -77,9 +77,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { const auto __k = __d(__g, __param_type{0, __pop_sz}); if (__k < __n) @@ -988,7 +988,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/experimental/algorithm gcc-6.3.0/li } /// Selection sampling algorithm. -@@ -88,7 +88,7 @@ +@@ -88,7 +88,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _OutputIterator __sample(_ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag, @@ -997,7 +997,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/experimental/algorithm gcc-6.3.0/li _Size __n, _UniformRandomNumberGenerator&& __g) { using __distrib_type = std::uniform_int_distribution<_Size>; -@@ -98,10 +98,10 @@ +@@ -98,10 +98,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION for (__n = std::min(__n, __unsampled_sz); __n != 0; ++__first) if (__d(__g, __param_type{0, --__unsampled_sz}) < __n) { @@ -1010,7 +1010,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/experimental/algorithm gcc-6.3.0/li } /// Take a random sample from a population. -@@ -109,7 +109,7 @@ +@@ -109,7 +109,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typename _Distance, typename _UniformRandomNumberGenerator> _SampleIterator sample(_PopulationIterator __first, _PopulationIterator __last, @@ -1019,7 +1019,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/experimental/algorithm gcc-6.3.0/li _UniformRandomNumberGenerator&& __g) { using __pop_cat = typename -@@ -128,7 +128,7 @@ +@@ -128,7 +128,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typename iterator_traits<_PopulationIterator>::difference_type __d = __n; return std::experimental::__sample( @@ -1028,10 +1028,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/experimental/algorithm gcc-6.3.0/li __d, std::forward<_UniformRandomNumberGenerator>(__g)); } -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/algorithm gcc-6.3.0/libstdc++-v3/include/ext/algorithm ---- gcc-6.3.0-orig/libstdc++-v3/include/ext/algorithm 2017-05-14 09:37:13.590007999 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/ext/algorithm 2017-05-14 09:56:41.196674666 -0700 -@@ -265,7 +265,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/ext/algorithm gcc-6.4.0/libstdc++-v3/include/ext/algorithm +--- gcc-6.4.0-orig/libstdc++-v3/include/ext/algorithm 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/ext/algorithm 2017-09-29 21:27:24.857164800 -0400 +@@ -265,7 +265,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typename _Distance> _OutputIterator random_sample_n(_ForwardIterator __first, _ForwardIterator __last, @@ -1040,7 +1040,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/algorithm gcc-6.3.0/libstdc++-v { // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) -@@ -280,14 +280,14 @@ +@@ -280,14 +280,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { if ((std::rand() % __remaining) < __m) { @@ -1058,7 +1058,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/algorithm gcc-6.3.0/libstdc++-v } /** -@@ -299,7 +299,7 @@ +@@ -299,7 +299,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typename _Distance, typename _RandomNumberGenerator> _OutputIterator random_sample_n(_ForwardIterator __first, _ForwardIterator __last, @@ -1067,7 +1067,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/algorithm gcc-6.3.0/libstdc++-v _RandomNumberGenerator& __rand) { // concept requirements -@@ -317,44 +317,44 @@ +@@ -317,44 +317,44 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { if (__rand(__remaining) < __m) { @@ -1120,7 +1120,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/algorithm gcc-6.3.0/libstdc++-v _RandomNumberGenerator& __rand, const _Distance __n) { -@@ -365,17 +365,17 @@ +@@ -365,17 +365,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Distance __m = 0; _Distance __t = __n; for ( ; __first != __last && __m < __n; ++__m, ++__first) @@ -1141,10 +1141,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/algorithm gcc-6.3.0/libstdc++-v } /** -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp gcc-6.3.0/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp ---- gcc-6.3.0-orig/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp 2017-05-14 09:37:13.586674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp 2017-05-14 09:56:41.196674666 -0700 -@@ -57,9 +57,9 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp gcc-6.4.0/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp +--- gcc-6.4.0-orig/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp 2017-09-29 21:27:24.867666600 -0400 +@@ -57,9 +57,9 @@ namespace __gnu_pbds // Need std::pair ostream extractor. template inline std::basic_ostream<_CharT, _Traits>& @@ -1156,10 +1156,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp #define PB_DS_CLASS_T_DEC \ template -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/random.tcc gcc-6.3.0/libstdc++-v3/include/ext/random.tcc ---- gcc-6.3.0-orig/libstdc++-v3/include/ext/random.tcc 2017-05-14 09:37:13.586674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/ext/random.tcc 2017-05-14 09:56:41.193341333 -0700 -@@ -207,38 +207,38 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/ext/random.tcc gcc-6.4.0/libstdc++-v3/include/ext/random.tcc +--- gcc-6.4.0-orig/libstdc++-v3/include/ext/random.tcc 2016-01-15 17:26:02.014719000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/ext/random.tcc 2017-09-29 21:27:24.880667900 -0400 +@@ -207,38 +207,38 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace { template @@ -1216,10 +1216,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/random.tcc gcc-6.3.0/libstdc++- } -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.3.0/libstdc++-v3/include/ext/vstring.tcc ---- gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc 2017-05-14 09:37:13.590007999 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/ext/vstring.tcc 2017-05-14 09:56:41.193341333 -0700 -@@ -549,7 +549,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.4.0/libstdc++-v3/include/ext/vstring.tcc +--- gcc-6.4.0-orig/libstdc++-v3/include/ext/vstring.tcc 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/ext/vstring.tcc 2017-09-29 21:27:24.891169400 -0400 +@@ -549,7 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template class _Base> basic_istream<_CharT, _Traits>& @@ -1228,7 +1228,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.3.0/libstdc++ __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>& __str) { -@@ -564,7 +564,7 @@ +@@ -564,7 +564,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __size_type __extracted = 0; typename __ios_base::iostate __err = __ios_base::goodbit; @@ -1237,7 +1237,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.3.0/libstdc++ if (__cerb) { __try -@@ -573,12 +573,12 @@ +@@ -573,12 +573,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __str.erase(); _CharT __buf[128]; __size_type __len = 0; @@ -1253,7 +1253,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.3.0/libstdc++ while (__extracted < __n && !_Traits::eq_int_type(__c, __eof) -@@ -592,17 +592,17 @@ +@@ -592,17 +592,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } __buf[__len++] = _Traits::to_char_type(__c); ++__extracted; @@ -1274,7 +1274,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.3.0/libstdc++ __throw_exception_again; } __catch(...) -@@ -610,21 +610,21 @@ +@@ -610,21 +610,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // _GLIBCXX_RESOLVE_LIB_DEFECTS // 91. Description of operator>> and getline() for string<> // might cause endless loop @@ -1300,7 +1300,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.3.0/libstdc++ __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>& __str, _CharT __delim) { -@@ -638,7 +638,7 @@ +@@ -638,7 +638,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __size_type __extracted = 0; const __size_type __n = __str.max_size(); typename __ios_base::iostate __err = __ios_base::goodbit; @@ -1309,7 +1309,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.3.0/libstdc++ if (__cerb) { __try -@@ -649,7 +649,7 @@ +@@ -649,7 +649,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __size_type __len = 0; const __int_type __idelim = _Traits::to_int_type(__delim); const __int_type __eof = _Traits::eof(); @@ -1318,7 +1318,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.3.0/libstdc++ while (__extracted < __n && !_Traits::eq_int_type(__c, __eof) -@@ -662,7 +662,7 @@ +@@ -662,7 +662,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } __buf[__len++] = _Traits::to_char_type(__c); ++__extracted; @@ -1327,7 +1327,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.3.0/libstdc++ } __str.append(__buf, __len); -@@ -671,14 +671,14 @@ +@@ -671,14 +671,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION else if (_Traits::eq_int_type(__c, __idelim)) { ++__extracted; @@ -1344,7 +1344,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.3.0/libstdc++ __throw_exception_again; } __catch(...) -@@ -686,14 +686,14 @@ +@@ -686,14 +686,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // _GLIBCXX_RESOLVE_LIB_DEFECTS // 91. Description of operator>> and getline() for string<> // might cause endless loop @@ -1362,10 +1362,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-6.3.0/libstdc++ } _GLIBCXX_END_NAMESPACE_VERSION -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++-v3/include/parallel/algo.h ---- gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h 2017-05-14 09:37:13.576674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/parallel/algo.h 2017-05-14 09:56:41.226674666 -0700 -@@ -300,48 +300,48 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.4.0/libstdc++-v3/include/parallel/algo.h +--- gcc-6.4.0-orig/libstdc++-v3/include/parallel/algo.h 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/parallel/algo.h 2017-09-29 21:27:24.906671300 -0400 +@@ -300,48 +300,48 @@ namespace __parallel // Sequential fallback template inline _OutputIterator @@ -1424,7 +1424,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ { typedef std::iterator_traits<_IIter> _IIterTraits; typedef std::iterator_traits<_OutputIterator> _OIterTraits; -@@ -350,14 +350,14 @@ +@@ -350,14 +350,14 @@ namespace __parallel typedef typename _OIterTraits::iterator_category _OIterCategory; return __unique_copy_switch( @@ -1441,7 +1441,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ _Predicate __pred) { typedef std::iterator_traits<_IIter> _IIterTraits; -@@ -366,7 +366,7 @@ +@@ -366,7 +366,7 @@ namespace __parallel typedef typename _OIterTraits::iterator_category _OIterCategory; return __unique_copy_switch( @@ -1450,7 +1450,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ _IIteratorCategory(), _OIterCategory()); } -@@ -376,9 +376,9 @@ +@@ -376,9 +376,9 @@ namespace __parallel inline _OutputIterator set_union(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2, @@ -1462,7 +1462,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ // Sequential fallback template inline _OutputIterator set_union(_IIter1 __begin1, _IIter1 __end1, @@ -1484,7 +1484,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ { typedef std::iterator_traits<_IIter1> _IIterTraits1; typedef std::iterator_traits<_IIter2> _IIterTraits2; -@@ -444,7 +444,7 @@ +@@ -444,7 +444,7 @@ namespace __parallel typedef typename _IIterTraits2::value_type _ValueType2; return __set_union_switch( @@ -1493,7 +1493,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ __gnu_parallel::_Less<_ValueType1, _ValueType2>(), _IIterCategory1(), _IIterCategory2(), _OIterCategory()); } -@@ -455,7 +455,7 @@ +@@ -455,7 +455,7 @@ namespace __parallel inline _OutputIterator set_union(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2, @@ -1502,7 +1502,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ { typedef std::iterator_traits<_IIter1> _IIterTraits1; typedef std::iterator_traits<_IIter2> _IIterTraits2; -@@ -467,7 +467,7 @@ +@@ -467,7 +467,7 @@ namespace __parallel typedef typename _OIterTraits::iterator_category _OIterCategory; return __set_union_switch( @@ -1511,7 +1511,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ _IIterCategory1(), _IIterCategory2(), _OIterCategory()); } -@@ -477,9 +477,9 @@ +@@ -477,9 +477,9 @@ namespace __parallel inline _OutputIterator set_intersection(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2, @@ -1523,7 +1523,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ // Sequential fallback. template _IIterTraits1; typedef std::iterator_traits<_IIter2> _IIterTraits2; -@@ -551,7 +551,7 @@ +@@ -551,7 +551,7 @@ namespace __parallel typedef typename _IIterTraits2::value_type _ValueType2; return __set_intersection_switch( @@ -1554,7 +1554,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ __gnu_parallel::_Less<_ValueType1, _ValueType2>(), _IIterCategory1(), _IIterCategory2(), _OIterCategory()); } -@@ -561,7 +561,7 @@ +@@ -561,7 +561,7 @@ namespace __parallel inline _OutputIterator set_intersection(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2, @@ -1563,7 +1563,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ { typedef std::iterator_traits<_IIter1> _IIterTraits1; typedef std::iterator_traits<_IIter2> _IIterTraits2; -@@ -573,7 +573,7 @@ +@@ -573,7 +573,7 @@ namespace __parallel typedef typename _OIterTraits::iterator_category _OIterCategory; return __set_intersection_switch( @@ -1572,7 +1572,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ _IIterCategory1(), _IIterCategory2(), _OIterCategory()); } -@@ -583,10 +583,10 @@ +@@ -583,10 +583,10 @@ namespace __parallel inline _OutputIterator set_symmetric_difference(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2, @@ -1585,7 +1585,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ // Sequential fallback template _IIterTraits1; typedef std::iterator_traits<_IIter2> _IIterTraits2; -@@ -658,7 +658,7 @@ +@@ -658,7 +658,7 @@ namespace __parallel typedef typename _IIterTraits2::value_type _ValueType2; return __set_symmetric_difference_switch( @@ -1616,7 +1616,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ __gnu_parallel::_Less<_ValueType1, _ValueType2>(), _IIterCategory1(), _IIterCategory2(), _OIterCategory()); } -@@ -669,7 +669,7 @@ +@@ -669,7 +669,7 @@ namespace __parallel inline _OutputIterator set_symmetric_difference(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2, @@ -1625,7 +1625,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ { typedef std::iterator_traits<_IIter1> _IIterTraits1; typedef std::iterator_traits<_IIter2> _IIterTraits2; -@@ -681,7 +681,7 @@ +@@ -681,7 +681,7 @@ namespace __parallel typedef typename _OIterTraits::iterator_category _OIterCategory; return __set_symmetric_difference_switch( @@ -1634,7 +1634,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ _IIterCategory1(), _IIterCategory2(), _OIterCategory()); } -@@ -691,9 +691,9 @@ +@@ -691,9 +691,9 @@ namespace __parallel inline _OutputIterator set_difference(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2, @@ -1646,7 +1646,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ // Sequential fallback. template _IIterTraits1; typedef std::iterator_traits<_IIter2> _IIterTraits2; -@@ -763,7 +763,7 @@ +@@ -763,7 +763,7 @@ namespace __parallel typedef typename _IIterTraits2::value_type _ValueType2; return __set_difference_switch( @@ -1677,7 +1677,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ __gnu_parallel::_Less<_ValueType1, _ValueType2>(), _IIterCategory1(), _IIterCategory2(), _OIterCategory()); } -@@ -774,7 +774,7 @@ +@@ -774,7 +774,7 @@ namespace __parallel inline _OutputIterator set_difference(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2, @@ -1686,7 +1686,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ { typedef std::iterator_traits<_IIter1> _IIterTraits1; typedef std::iterator_traits<_IIter2> _IIterTraits2; -@@ -786,7 +786,7 @@ +@@ -786,7 +786,7 @@ namespace __parallel typedef typename _OIterTraits::iterator_category _OIterCategory; return __set_difference_switch( @@ -1695,10 +1695,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/algo.h gcc-6.3.0/libstdc++ _IIterCategory1(), _IIterCategory2(), _OIterCategory()); } -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/multiway_merge.h gcc-6.3.0/libstdc++-v3/include/parallel/multiway_merge.h ---- gcc-6.3.0-orig/libstdc++-v3/include/parallel/multiway_merge.h 2017-05-14 09:37:13.580007999 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/parallel/multiway_merge.h 2017-05-14 09:56:41.230007999 -0700 -@@ -1372,7 +1372,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/parallel/multiway_merge.h gcc-6.4.0/libstdc++-v3/include/parallel/multiway_merge.h +--- gcc-6.4.0-orig/libstdc++-v3/include/parallel/multiway_merge.h 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/parallel/multiway_merge.h 2017-09-29 21:27:24.921673100 -0400 +@@ -1372,7 +1372,7 @@ namespace __gnu_parallel * for (int __j = 0; __i < 10; ++__j) * sequences[__i][__j] = __j; * @@ -1707,7 +1707,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/multiway_merge.h gcc-6.3.0 * std::vector > seqs; * for (int __i = 0; __i < 10; ++__i) * { seqs.push(std::make_pair(sequences[__i], -@@ -1733,7 +1733,7 @@ +@@ -1733,7 +1733,7 @@ namespace __gnu_parallel * for (int __j = 0; __i < 11; ++__j) * sequences[__i][__j] = __j; // __last one is sentinel! * @@ -1716,10 +1716,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/multiway_merge.h gcc-6.3.0 * std::vector > seqs; * for (int __i = 0; __i < 10; ++__i) * { seqs.push(std::make_pair(sequences[__i], -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-6.3.0/libstdc++-v3/include/parallel/set_operations.h ---- gcc-6.3.0-orig/libstdc++-v3/include/parallel/set_operations.h 2017-05-14 09:37:13.576674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/parallel/set_operations.h 2017-05-14 09:56:41.226674666 -0700 -@@ -130,12 +130,12 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-6.4.0/libstdc++-v3/include/parallel/set_operations.h +--- gcc-6.4.0-orig/libstdc++-v3/include/parallel/set_operations.h 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/parallel/set_operations.h 2017-09-29 21:27:24.936175500 -0400 +@@ -130,12 +130,12 @@ namespace __gnu_parallel } _OutputIterator @@ -1736,7 +1736,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-6.3.0 }; -@@ -198,12 +198,12 @@ +@@ -198,12 +198,12 @@ namespace __gnu_parallel } _OutputIterator @@ -1753,7 +1753,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-6.3.0 }; -@@ -265,12 +265,12 @@ +@@ -265,12 +265,12 @@ namespace __gnu_parallel } _OutputIterator @@ -1770,7 +1770,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-6.3.0 }; template -@@ -335,12 +335,12 @@ +@@ -335,12 +335,12 @@ namespace __gnu_parallel } _OutputIterator @@ -1787,10 +1787,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-6.3.0 }; template basic_istream<_CharT, _Traits>& @@ -1862,7 +1862,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/istream gcc-6.3.0/libstdc++-v3/ * * Behaves like one of the formatted arithmetic extractors described in * std::basic_istream. After constructing a sentry object with good -@@ -791,22 +791,22 @@ +@@ -791,22 +791,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ template basic_istream<_CharT, _Traits>& @@ -1891,10 +1891,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/istream gcc-6.3.0/libstdc++-v3/ //@} /** -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/ostream gcc-6.3.0/libstdc++-v3/include/std/ostream ---- gcc-6.3.0-orig/libstdc++-v3/include/std/ostream 2017-05-14 09:37:13.583341333 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/std/ostream 2017-05-14 09:56:41.200008000 -0700 -@@ -479,14 +479,14 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/std/ostream gcc-6.4.0/libstdc++-v3/include/std/ostream +--- gcc-6.4.0-orig/libstdc++-v3/include/std/ostream 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/std/ostream 2017-09-29 21:27:24.968679000 -0400 +@@ -479,14 +479,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION //@{ /** * @brief Character inserters @@ -1911,7 +1911,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/ostream gcc-6.3.0/libstdc++-v3/ * called. * * If @p __c is of type @c char and the character type of the stream is not -@@ -494,36 +494,36 @@ +@@ -494,36 +494,36 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ template inline basic_ostream<_CharT, _Traits>& @@ -1959,7 +1959,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/ostream gcc-6.3.0/libstdc++-v3/ * @param __s A character string. * @return out * @pre @p __s must be a non-NULL pointer -@@ -532,47 +532,47 @@ +@@ -532,47 +532,47 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * std::basic_ostream. After constructing a sentry object with good * status, this function inserts @c traits::length(__s) characters starting * at @p __s, widened if necessary, followed by any required padding (as @@ -2021,10 +2021,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/ostream gcc-6.3.0/libstdc++-v3/ //@} // Standard basic_ostream manipulators -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/thread gcc-6.3.0/libstdc++-v3/include/std/thread ---- gcc-6.3.0-orig/libstdc++-v3/include/std/thread 2017-05-14 09:37:13.583341333 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/std/thread 2017-05-14 09:56:41.200008000 -0700 -@@ -107,7 +107,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/std/thread gcc-6.4.0/libstdc++-v3/include/std/thread +--- gcc-6.4.0-orig/libstdc++-v3/include/std/thread 2017-01-06 08:20:10.706341000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/std/thread 2017-09-29 21:27:24.978180600 -0400 +@@ -107,7 +107,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template friend basic_ostream<_CharT, _Traits>& @@ -2033,7 +2033,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/thread gcc-6.3.0/libstdc++-v3/i }; private: -@@ -259,12 +259,12 @@ +@@ -260,12 +260,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template inline basic_ostream<_CharT, _Traits>& @@ -2049,10 +2049,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/thread gcc-6.3.0/libstdc++-v3/i } _GLIBCXX_END_NAMESPACE_VERSION -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/include/std/tuple ---- gcc-6.3.0-orig/libstdc++-v3/include/std/tuple 2017-05-14 09:37:13.583341333 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/std/tuple 2017-05-14 09:56:41.196674666 -0700 -@@ -215,23 +215,23 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/std/tuple gcc-6.4.0/libstdc++-v3/include/std/tuple +--- gcc-6.4.0-orig/libstdc++-v3/include/std/tuple 2017-01-15 11:03:16.994576000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/std/tuple 2017-09-29 21:27:24.992182500 -0400 +@@ -215,23 +215,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr _Tuple_impl(const _Tuple_impl&) = default; constexpr @@ -2085,7 +2085,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a) -@@ -255,81 +255,81 @@ +@@ -255,81 +255,81 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a, @@ -2195,7 +2195,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in } }; -@@ -363,17 +363,17 @@ +@@ -363,17 +363,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr _Tuple_impl(const _Tuple_impl&) = default; constexpr @@ -2219,7 +2219,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in { } template -@@ -393,67 +393,67 @@ +@@ -393,67 +393,67 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a, @@ -2305,7 +2305,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in } }; -@@ -667,8 +667,8 @@ +@@ -667,8 +667,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION && _TNTC<_Dummy>::template _NonNestedTuple&>(), bool>::type=true> @@ -2316,7 +2316,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in { } template::template _NonNestedTuple&>(), bool>::type=false> @@ -2327,7 +2327,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in { } template::template _NonNestedTuple&&>(), bool>::type=true> @@ -2338,7 +2338,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template::template -@@ -702,8 +702,8 @@ +@@ -702,8 +702,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION && _TNTC<_Dummy>::template _NonNestedTuple&&>(), bool>::type=false> @@ -2349,7 +2349,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in // Allocator-extended constructors. -@@ -756,12 +756,12 @@ +@@ -756,12 +756,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { } template @@ -2366,7 +2366,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template::template -@@ -770,9 +770,9 @@ +@@ -770,9 +770,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _ImplicitlyConvertibleTuple<_UElements...>(), bool>::type=true> tuple(allocator_arg_t __tag, const _Alloc& __a, @@ -2378,7 +2378,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in { } template(), bool>::type=false> explicit tuple(allocator_arg_t __tag, const _Alloc& __a, @@ -2390,7 +2390,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in { } template(), bool>::type=true> tuple(allocator_arg_t __tag, const _Alloc& __a, @@ -2402,7 +2402,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in { } template(), bool>::type=false> explicit tuple(allocator_arg_t __tag, const _Alloc& __a, @@ -2432,7 +2432,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in return *this; } -@@ -830,9 +830,9 @@ +@@ -830,9 +830,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION enable_if::type> tuple& @@ -2444,7 +2444,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in return *this; } -@@ -840,16 +840,16 @@ +@@ -840,16 +840,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION enable_if::type> tuple& @@ -2466,7 +2466,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in }; // Explicit specialization, zero-element tuple. -@@ -947,8 +947,8 @@ +@@ -951,8 +951,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION && _TMC::template _ImplicitlyConvertibleTuple<_U1, _U2>(), bool>::type = true> @@ -2477,7 +2477,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template(), bool>::type = false> @@ -2488,7 +2488,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template(), bool>::type = true> @@ -2499,7 +2499,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template(), bool>::type = false> @@ -2510,7 +2510,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template(), bool>::type = true> @@ -2521,7 +2521,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template(), bool>::type = false> @@ -2532,7 +2532,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template(), bool>::type = true> @@ -2545,7 +2545,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template(), bool>::type = false> @@ -2558,7 +2558,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in // Allocator-extended constructors. -@@ -1067,12 +1067,12 @@ +@@ -1071,12 +1071,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION std::forward<_U2>(__a2)) { } template @@ -2575,7 +2575,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template(), bool>::type = true> tuple(allocator_arg_t __tag, const _Alloc& __a, @@ -2587,7 +2587,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in { } template(), bool>::type = false> explicit tuple(allocator_arg_t __tag, const _Alloc& __a, @@ -2599,7 +2599,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in { } template(), bool>::type = true> @@ -2610,7 +2610,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in { } template(), bool>::type = false> explicit tuple(allocator_arg_t __tag, const _Alloc& __a, @@ -2621,7 +2621,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in { } template(), bool>::type = true> tuple(allocator_arg_t __tag, const _Alloc& __a, @@ -2632,7 +2632,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template(), bool>::type = false> explicit tuple(allocator_arg_t __tag, const _Alloc& __a, @@ -2643,7 +2643,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template(), bool>::type = true> @@ -2656,7 +2656,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in template(), bool>::type = false> explicit tuple(allocator_arg_t __tag, const _Alloc& __a, @@ -2740,10 +2740,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/tuple gcc-6.3.0/libstdc++-v3/in }; -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/utility gcc-6.3.0/libstdc++-v3/include/std/utility ---- gcc-6.3.0-orig/libstdc++-v3/include/std/utility 2017-05-14 09:37:13.583341333 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/std/utility 2017-05-14 09:56:41.196674666 -0700 -@@ -199,18 +199,18 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/std/utility gcc-6.4.0/libstdc++-v3/include/std/utility +--- gcc-6.4.0-orig/libstdc++-v3/include/std/utility 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/std/utility 2017-09-29 21:27:25.001683400 -0400 +@@ -199,18 +199,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template constexpr typename tuple_element<_Int, std::pair<_Tp1, _Tp2>>::type& @@ -2768,10 +2768,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/std/utility gcc-6.3.0/libstdc++-v3/ #if __cplusplus > 201103L -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr1/regex gcc-6.3.0/libstdc++-v3/include/tr1/regex ---- gcc-6.3.0-orig/libstdc++-v3/include/tr1/regex 2017-05-14 09:37:13.583341333 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/tr1/regex 2017-05-14 09:56:41.223341333 -0700 -@@ -2008,7 +2008,7 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/tr1/regex gcc-6.4.0/libstdc++-v3/include/tr1/regex +--- gcc-6.4.0-orig/libstdc++-v3/include/tr1/regex 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/tr1/regex 2017-09-29 21:27:25.018185900 -0400 +@@ -2008,7 +2008,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ template _Out_iter @@ -2780,7 +2780,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr1/regex gcc-6.3.0/libstdc++-v3/in regex_constants::match_flag_type __flags = regex_constants::format_default) const; -@@ -2404,7 +2404,7 @@ +@@ -2404,7 +2404,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template inline _Out_iter @@ -2789,10 +2789,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr1/regex gcc-6.3.0/libstdc++-v3/in const basic_regex<_Ch_type, _Rx_traits>& __e, const basic_string<_Ch_type>& __fmt, regex_constants::match_flag_type __flags -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr1/tuple gcc-6.3.0/libstdc++-v3/include/tr1/tuple ---- gcc-6.3.0-orig/libstdc++-v3/include/tr1/tuple 2017-05-14 09:37:13.580007999 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/tr1/tuple 2017-05-14 09:56:41.220007999 -0700 -@@ -102,26 +102,26 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/tr1/tuple gcc-6.4.0/libstdc++-v3/include/tr1/tuple +--- gcc-6.4.0-orig/libstdc++-v3/include/tr1/tuple 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/tr1/tuple 2017-09-29 21:27:25.030187000 -0400 +@@ -102,26 +102,26 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _Inherited(__tail...), _M_head(__head) { } template @@ -2829,7 +2829,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr1/tuple gcc-6.3.0/libstdc++-v3/in return *this; } }; -@@ -139,24 +139,24 @@ +@@ -139,24 +139,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _Inherited(__elements...) { } template @@ -2862,7 +2862,7 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr1/tuple gcc-6.3.0/libstdc++-v3/in return *this; } }; -@@ -178,41 +178,41 @@ +@@ -178,41 +178,41 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _Inherited(__a1, __a2) { } template @@ -2918,10 +2918,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr1/tuple gcc-6.3.0/libstdc++-v3/in return *this; } }; -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr1/utility gcc-6.3.0/libstdc++-v3/include/tr1/utility ---- gcc-6.3.0-orig/libstdc++-v3/include/tr1/utility 2017-05-14 09:37:13.583341333 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/tr1/utility 2017-05-14 09:56:41.220007999 -0700 -@@ -93,13 +93,13 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/tr1/utility gcc-6.4.0/libstdc++-v3/include/tr1/utility +--- gcc-6.4.0-orig/libstdc++-v3/include/tr1/utility 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/tr1/utility 2017-09-29 21:27:25.038688300 -0400 +@@ -93,13 +93,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template inline typename tuple_element<_Int, std::pair<_Tp1, _Tp2> >::type& @@ -2939,10 +2939,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr1/utility gcc-6.3.0/libstdc++-v3/ _GLIBCXX_END_NAMESPACE_VERSION } -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr2/bool_set gcc-6.3.0/libstdc++-v3/include/tr2/bool_set ---- gcc-6.3.0-orig/libstdc++-v3/include/tr2/bool_set 2017-05-14 09:37:13.576674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/tr2/bool_set 2017-05-14 09:56:41.200008000 -0700 -@@ -131,18 +131,18 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/tr2/bool_set gcc-6.4.0/libstdc++-v3/include/tr2/bool_set +--- gcc-6.4.0-orig/libstdc++-v3/include/tr2/bool_set 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/tr2/bool_set 2017-09-29 21:27:25.047189300 -0400 +@@ -131,18 +131,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template friend std::basic_ostream& @@ -2965,10 +2965,10 @@ diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr2/bool_set gcc-6.3.0/libstdc++-v3 if (__c >= _S_false && __c < _S_empty) __b._M_b = static_cast<_Bool_set_val>(__c); } -diff -ur gcc-6.3.0-orig/libstdc++-v3/include/tr2/bool_set.tcc gcc-6.3.0/libstdc++-v3/include/tr2/bool_set.tcc ---- gcc-6.3.0-orig/libstdc++-v3/include/tr2/bool_set.tcc 2017-05-14 09:37:13.576674666 -0700 -+++ gcc-6.3.0/libstdc++-v3/include/tr2/bool_set.tcc 2017-05-14 09:56:41.200008000 -0700 -@@ -100,9 +100,9 @@ +diff -aurp gcc-6.4.0-orig/libstdc++-v3/include/tr2/bool_set.tcc gcc-6.4.0/libstdc++-v3/include/tr2/bool_set.tcc +--- gcc-6.4.0-orig/libstdc++-v3/include/tr2/bool_set.tcc 2016-01-04 09:30:50.652828000 -0500 ++++ gcc-6.4.0/libstdc++-v3/include/tr2/bool_set.tcc 2017-09-29 21:27:25.056190400 -0400 +@@ -100,9 +100,9 @@ _GLIBCXX_END_NAMESPACE_VERSION * @param v Value to format and insert. * @return Iterator after reading. iter_type diff --git a/gcc/PKGBUILD b/gcc/PKGBUILD index 6c7859e4..ab0bc0e6 100644 --- a/gcc/PKGBUILD +++ b/gcc/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=gcc pkgname=('gcc' 'gcc-libs' 'gcc-fortran') -pkgver=6.3.0 -pkgrel=2 +pkgver=6.4.0 +pkgrel=1 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') groups=('msys2-devel') @@ -22,7 +22,7 @@ STRIP_OPTION="strip" #DEBUG_OPTION="debug" DEBUG_OPTION="!debug" options=('!emptydirs' "$STRIP_OPTION" "$DEBUG_OPTION") -source=(https://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 +source=(https://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/gcc-${pkgver}.tar.gz 0001-share-mingw-fset-stack-executable-with-cygwin.patch 0002-boehm-gc-for-cygwin.patch 0003-AWT-Font-fix-for-Cygwin.patch @@ -51,7 +51,7 @@ source=(https://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 0951-6.3.0-msys2-spec.patch 0953-6.3.0-testsuite-msys2.patch 0955-4.9.2-apply-hack-so-gcc_s-isnt-stripped.patch) -md5sums=('677a7623c7ef6ab99881bc4e048debb6' +md5sums=('3124e1563958a24a64210236852f7283' '7d49c7e9395ebfe572ec0ea3e88fdf2e' '90c20705f3dd2559f90367bcb81c3e65' '939c9c0799f52438e33da05b36512632' @@ -74,57 +74,80 @@ md5sums=('677a7623c7ef6ab99881bc4e048debb6' '188e3ad9985b1b6116e25d6ac8aec9e5' '448fba3bea5e7c2e5289559315dc4733' 'f8a397bc46560b09338abab5355f9a97' - '6ece7e4cd164180ddffd89173cc258ea' - 'd0ad8e18f67d16d1702b56c48597ed38' + '5074b74c549e11a06717d4999b406383' + '0853c463318bb702083980adb08f1c44' '77ee53d0d97cff56efc48ba967b576e7' '79d1b1d8247097cbd9ac7b2e104ace1e' '6defafd4e0bf699c1280878f0224d523' '6f9fb2d7fcd0b82d12047d56f1f0898d') +# Helper macros to help make tasks easier # +apply_patch_with_msg() { + for _fname in "$@" + do + msg2 "Applying ${_fname}" + patch -Nbp1 -i "${srcdir}"/${_fname} + done +} + +del_file_exists() { + for _fname in "$@" + do + if [ -f $_fname ] || [ -d $_fname ]; then + rm -rf $_fname + fi + done +} +# =========================================== # + prepare() { cd ${srcdir}/gcc-${pkgver} # Remove files created by patches - rm -f gcc/ada/system-cygwin-x86_64.ads libgcc/config/i386/t-msys \ - gcc/config/i386/msys.h gcc/config/i386/msys-w64.h \ - gcc/config/i386/t-msys-w64 \ - > /dev/null 2>&1 | true + rm -f config/mt-cygwin \ + gcc/ada/system-cygwin-x86_64.ads \ + libgomp/config/cygwin/plugin-suffix.h \ + libgcc/config/i386/t-msys \ + gcc/config/i386/msys.h \ + gcc/config/i386/msys-w64.h \ + gcc/config/i386/t-msys-w64 > /dev/null 2>&1 | true # Cygwin patches - patch -p1 -i ${srcdir}/0001-share-mingw-fset-stack-executable-with-cygwin.patch - patch -p1 -i ${srcdir}/0002-boehm-gc-for-cygwin.patch - patch -p1 -i ${srcdir}/0003-AWT-Font-fix-for-Cygwin.patch - patch -p1 -i ${srcdir}/0004-Cygwin-ioctl-may-emit-EINVAL.patch - patch -p1 -i ${srcdir}/0005-use-avoid-version-if-not-tracking-SO-version.patch - patch -p1 -i ${srcdir}/0006-cygwin-uses-cyg-library-prefix.patch - patch -p1 -i ${srcdir}/0007-Avoid-installing-libffi.patch - patch -p1 -i ${srcdir}/0009-Cygwin-uses-sysv-ABI-on-x86_64.patch - patch -p1 -i ${srcdir}/0010-Do-not-version-lto-plugin-on-cygwin-mingw.patch - patch -p1 -i ${srcdir}/0011-add-dummy-pthread-tsaware-and-large-address-aware-fo.patch - patch -p1 -i ${srcdir}/0012-handle-dllimport-properly-in-medium-model.patch - patch -p1 -i ${srcdir}/0013-skip-test-for-cygwin-mingw.patch - patch -p1 -i ${srcdir}/0014-64bit-Cygwin-uses-SEH.patch - patch -p1 -i ${srcdir}/0015-define-RTS_CONTROL_ENABLE-and-DTR_CONTROL_ENABLE-for.patch - patch -p1 -i ${srcdir}/0016-fix-some-implicit-declaration-warnings.patch - patch -p1 -i ${srcdir}/0017-__cxa-atexit-for-Cygwin.patch - patch -p1 -i ${srcdir}/0018-prevent-modules-from-being-unloaded-before-their-dto.patch - patch -p1 -i ${srcdir}/0019-Cygwin-doesn-t-do-text-mode-translations-for-file-ha.patch - patch -p1 -i ${srcdir}/0020-cygwin-uses-cyg-lib-prefix.patch - patch -p1 -i ${srcdir}/0022-libgomp-soname-cygwin-mingw.patch - patch -p1 -i ${srcdir}/0024-libitm-weak-symbols.patch - patch -p1 -i ${srcdir}/0025-enable-libcilkrts.patch - patch -p1 -i ${srcdir}/0028-g++-time.patch + apply_patch_with_msg \ + 0001-share-mingw-fset-stack-executable-with-cygwin.patch \ + 0002-boehm-gc-for-cygwin.patch \ + 0003-AWT-Font-fix-for-Cygwin.patch \ + 0004-Cygwin-ioctl-may-emit-EINVAL.patch \ + 0005-use-avoid-version-if-not-tracking-SO-version.patch \ + 0006-cygwin-uses-cyg-library-prefix.patch \ + 0007-Avoid-installing-libffi.patch \ + 0009-Cygwin-uses-sysv-ABI-on-x86_64.patch \ + 0010-Do-not-version-lto-plugin-on-cygwin-mingw.patch \ + 0011-add-dummy-pthread-tsaware-and-large-address-aware-fo.patch \ + 0012-handle-dllimport-properly-in-medium-model.patch \ + 0013-skip-test-for-cygwin-mingw.patch \ + 0014-64bit-Cygwin-uses-SEH.patch \ + 0015-define-RTS_CONTROL_ENABLE-and-DTR_CONTROL_ENABLE-for.patch \ + 0016-fix-some-implicit-declaration-warnings.patch \ + 0017-__cxa-atexit-for-Cygwin.patch \ + 0018-prevent-modules-from-being-unloaded-before-their-dto.patch \ + 0019-Cygwin-doesn-t-do-text-mode-translations-for-file-ha.patch \ + 0020-cygwin-uses-cyg-lib-prefix.patch \ + 0022-libgomp-soname-cygwin-mingw.patch \ + 0024-libitm-weak-symbols.patch \ + 0025-enable-libcilkrts.patch + patch -Np2 -i ${srcdir}/0028-g++-time.patch # MINGW Patches - patch -p1 -i ${srcdir}/0130-libstdc++-in-out.patch + apply_patch_with_msg 0130-libstdc++-in-out.patch # MSYS2 Patches - patch -p1 -i ${srcdir}/0950-6.3.0-configure-msys2.patch - patch -p1 -i ${srcdir}/0951-6.3.0-msys2-spec.patch - patch -p1 -i ${srcdir}/0953-6.3.0-testsuite-msys2.patch - patch -p1 -i ${srcdir}/0955-4.9.2-apply-hack-so-gcc_s-isnt-stripped.patch + apply_patch_with_msg \ + 0950-6.3.0-configure-msys2.patch \ + 0951-6.3.0-msys2-spec.patch \ + 0953-6.3.0-testsuite-msys2.patch \ + 0955-4.9.2-apply-hack-so-gcc_s-isnt-stripped.patch - # Do not run fixincludes #sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in echo ${pkgver} > gcc/BASE-VER @@ -202,13 +225,13 @@ build() { #make doc-man-doxygen } -check() { - cd ${srcdir}/build-$(arch) +#check() { +# cd ${srcdir}/build-$(arch) - # do not abort on error as some are "expected" - make -k check || true - ${srcdir}/gcc-${pkgver}/contrib/test_summary -} +# # do not abort on error as some are "expected" +# make -k check || true +# ${srcdir}/gcc-${pkgver}/contrib/test_summary +#} package_gcc-libs() {