Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

gcc: Update to 10.2.0

Browse Source
This commit is contained in:
Alexey Pavlov
2020-07-24 21:40:00 +03:00
parent 93c6d6f64a
commit 89157e00d3
2 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
mingw-w64-gcc/0130-libstdc++-in-out.patch
View File

@@ -837,9 +837,9 @@ diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_algo.h gcc-10.1.0/li
diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_algobase.h gcc-10.1.0/libstdc++-v3/include/bits/ranges_algobase.h
--- gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_algobase.h 2020-05-07 13:50:02.000000000 +0300
+++ gcc-10.1.0/libstdc++-v3/include/bits/ranges_algobase.h 2020-05-08 17:16:30.310826200 +0300
@@ -220,29 +220,29 @@
constexpr bool __move_iterator_p = __detail::__is_move_iterator<_Iter>;
if constexpr (__move_iterator_p)
@@ -220,34 +220,34 @@
using __detail::__is_normal_iterator;
if constexpr (__is_move_iterator<_Iter> && same_as<_Iter, _Sent>)
{
- auto [__in, __out]
+ auto [___in, ___out]
@@ -849,58 +849,71 @@ diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_algobase.h gcc-10.1.
- return {move_iterator{std::move(__in)}, std::move(__out)};
+ return {move_iterator{std::move(___in)}, std::move(___out)};
}
else if constexpr (__reverse_p)
else if constexpr (__is_reverse_iterator<_Iter> && same_as<_Iter, _Sent>
&& __is_reverse_iterator<_Out>)
{
- auto [__in,__out]
+ auto [___in,___out]
= ranges::__copy_or_move_backward<_IsMove>(__last.base(),
__first.base(),
__result.base());
= ranges::__copy_or_move_backward<_IsMove>(std::move(__last).base(),
std::move(__first).base(),
std::move(__result).base());
- return {reverse_iterator{std::move(__in)},
- reverse_iterator{std::move(__out)}};
+ return {reverse_iterator{std::move(___in)},
+ reverse_iterator{std::move(___out)}};
}
else if constexpr (__normal_iterator_p)
else if constexpr (__is_normal_iterator<_Iter> && same_as<_Iter, _Sent>)
{
- auto [__in,__out]
+ auto [___in,___out]
= ranges::__copy_or_move<_IsMove>(std::__niter_base(__first),
std::__niter_base(__last),
std::__niter_base(__result));
- return {std::__niter_wrap(__first, std::move(__in)),
- std::__niter_wrap(__result, std::move(__out))};
+ return {std::__niter_wrap(__first, std::move(___in)),
+ std::__niter_wrap(__result, std::move(___out))};
= ranges::__copy_or_move<_IsMove>(__first.base(), __last.base(),
__result);
- return {decltype(__first){__in}, std::move(__out)};
+ return {decltype(__first){___in}, std::move(___out)};
}
else if constexpr (__is_normal_iterator<_Out>)
{
- auto [__in,__out]
+ auto [___in,___out]
= ranges::__copy_or_move<_IsMove>(__first, __last, __result.base());
- return {std::move(__in), decltype(__result){__out}};
+ return {std::move(___in), decltype(__result){___out}};
}
else if constexpr (sized_sentinel_for<_Sent, _Iter>)
{
@@ -361,22 +361,22 @@
&& __detail::__is_reverse_iterator<_Out>);
if constexpr (__reverse_p)
@@ -363,28 +363,28 @@
if constexpr (__is_reverse_iterator<_Iter> && same_as<_Iter, _Sent>
&& __is_reverse_iterator<_Out>)
{
- auto [__in,__out]
+ auto [___in,___out]
= ranges::__copy_or_move<_IsMove>(__last.base(),
__first.base(),
__result.base());
= ranges::__copy_or_move<_IsMove>(std::move(__last).base(),
std::move(__first).base(),
std::move(__result).base());
- return {reverse_iterator{std::move(__in)},
- reverse_iterator{std::move(__out)}};
+ return {reverse_iterator{std::move(___in)},
+ reverse_iterator{std::move(___out)}};
}
else if constexpr (__normal_iterator_p)
else if constexpr (__is_normal_iterator<_Iter> && same_as<_Iter, _Sent>)
{
- auto [__in,__out]
+ auto [___in,___out]
= ranges::__copy_or_move_backward<_IsMove>
(std::__niter_base(__first),
std::__niter_base(__last),
std::__niter_base(__result));
- return {std::__niter_wrap(__first, std::move(__in)),
- std::__niter_wrap(__result, std::move(__out))};
+ return {std::__niter_wrap(__first, std::move(___in)),
+ std::__niter_wrap(__result, std::move(___out))};
= ranges::__copy_or_move_backward<_IsMove>(__first.base(),
__last.base(),
std::move(__result));
- return {decltype(__first){__in}, std::move(__out)};
+ return {decltype(__first){___in}, std::move(___out)};
}
else if constexpr (__is_normal_iterator<_Out>)
{
- auto [__in,__out]
+ auto [___in,___out]
= ranges::__copy_or_move_backward<_IsMove>(std::move(__first),
std::move(__last),
__result.base());
- return {std::move(__in), decltype(__result){__out}};
+ return {std::move(___in), decltype(__result){___out}};
}
else if constexpr (sized_sentinel_for<_Sent, _Iter>)
{

8
mingw-w64-gcc/PKGBUILD
View File

@@ -17,11 +17,11 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
$([[ "$_enable_objc" == "yes" ]] && echo "${MINGW_PACKAGE_PREFIX}-${_realname}-objc")
)
#_snapshot=20181214
pkgver=10.1.0
pkgver=10.2.0
#_majorver=${pkgver:0:1}
#_sourcedir=${_realname}-${_majorver}-${_snapshot}
_sourcedir=${_realname}-${pkgver}
pkgrel=4
pkgrel=1
pkgdesc="GCC for the MinGW-w64"
arch=('any')
url="https://gcc.gnu.org"
@@ -64,7 +64,7 @@ source=("https://ftp.gnu.org/gnu/gcc/${_realname}-${pkgver%%+*}/${_realname}-${p
0021-gcc-config-i386-mingw32.h-Ensure-lmsvcrt-precede-lke.patch
0130-libstdc++-in-out.patch
0140-gcc-8.2.0-diagnostic-color.patch)
sha256sums=('b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2'
sha256sums=('b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c'
'SKIP'
'bce81824fc89e5e62cca350de4c17a27e27a18a1a1ad5ca3492aec1fc5af3234'
'1247e81571c908548b4d9aaa3df1ad8fd73aad7b81e7eafea12d53bbada70e94'
@@ -82,7 +82,7 @@ sha256sums=('b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2'
'4233a8d893787413b316de3ac320fd65c46844d463b98c0a98fdc17100cca505'
'276ecc392c777d4b17d771a987e80dca50ff25d8f65671d5de139be73997064b'
'c7359f4c7015bc1fb02bc13449fa9826669273bd1f0663ba898decb67e8487fc'
'441d63d95622ffcc2fa5dd688aecad20d2ab16d7d275c567865a754e1d3d4b7a'
'055289699c4222ef0b8125abdc8c9ceeff0712876c86e6d552a056fbacc14284'
'5240a9e731b45c17a164066c7eb193c1fbee9fd8d9a2a5afa2edbcde9510da47')
validpgpkeys=('33C235A34C46AA3FFB293709A328C3A2C3C45C06')