From 9501ee2afc8d01dc7d85383e4b22e91c30d93ca7 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Sun, 10 May 2020 11:27:36 +0300 Subject: [PATCH] gcc: Update to 10.1.0. Disable plugins support due to linking fail with "export ordinals too large" --- mingw-w64-gcc/0002-Relocate-libintl.patch | 8 +- ...osix-dir-exists-semantics-more-close.patch | 4 +- ...on-t-ignore-native-system-header-dir.patch | 4 +- ...dows-New-feature-to-allow-overriding.patch | 2 +- .../0008-Prettify-linking-no-undefined.patch | 4 +- ...in-header-cplusplus-compatible-depre.patch | 2 +- mingw-w64-gcc/0010-Fix-using-large-PCH.patch | 50 +- .../0011-Enable-shared-gnat-implib.patch | 2 +- ...-spaces-in-path-for-default-manifest.patch | 14 +- ...ion_name_1-Retain-any-stdcall-suffix.patch | 4 +- ...Don-t-hard-code-MS-printf-attributes.patch | 53 + mingw-w64-gcc/0130-libstdc++-in-out.patch | 1519 ++++++++++++----- .../0140-gcc-8.2.0-diagnostic-color.patch | 4 +- mingw-w64-gcc/PKGBUILD | 45 +- 14 files changed, 1207 insertions(+), 508 deletions(-) create mode 100644 mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch diff --git a/mingw-w64-gcc/0002-Relocate-libintl.patch b/mingw-w64-gcc/0002-Relocate-libintl.patch index 146aee23cc..ecf4ba26c5 100644 --- a/mingw-w64-gcc/0002-Relocate-libintl.patch +++ b/mingw-w64-gcc/0002-Relocate-libintl.patch @@ -56,7 +56,7 @@ index 3dd0b7f..e2b8666 100644 gmo.h \ gettextP.h \ hash-string.h \ -@@ -61,6 +62,7 @@ HEADERS = \ +@@ -62,6 +63,7 @@ HEADERS = \ eval-plural.h \ localcharset.h \ relocatable.h \ @@ -64,7 +64,7 @@ index 3dd0b7f..e2b8666 100644 libgnuintl.h SOURCES = \ bindtextdom.c \ -@@ -81,6 +83,8 @@ SOURCES = \ +@@ -82,6 +84,8 @@ SOURCES = \ plural-exp.c \ localcharset.c \ relocatable.c \ @@ -73,7 +73,7 @@ index 3dd0b7f..e2b8666 100644 localename.c \ log.c \ osdep.c \ -@@ -104,6 +108,8 @@ OBJECTS = \ +@@ -105,6 +109,8 @@ OBJECTS = \ plural-exp.o \ localcharset.o \ relocatable.o \ @@ -82,7 +82,7 @@ index 3dd0b7f..e2b8666 100644 localename.o \ log.o \ osdep.o \ -@@ -158,7 +164,7 @@ install-info install-dvi install-ps install-pdf install-html: +@@ -165,7 +171,7 @@ install-info install-dvi install-ps install-pdf install-html: $(OBJECTS): config.h libintl.h bindtextdom.o dcgettext.o dcigettext.o dcngettext.o dgettext.o \ dngettext.o finddomain.o gettext.o intl-compat.o loadmsgcat.o \ diff --git a/mingw-w64-gcc/0003-Windows-Follow-Posix-dir-exists-semantics-more-close.patch b/mingw-w64-gcc/0003-Windows-Follow-Posix-dir-exists-semantics-more-close.patch index f4ce3411e1..2cbe21f58d 100644 --- a/mingw-w64-gcc/0003-Windows-Follow-Posix-dir-exists-semantics-more-close.patch +++ b/mingw-w64-gcc/0003-Windows-Follow-Posix-dir-exists-semantics-more-close.patch @@ -31,7 +31,7 @@ index ea2cc23..ac17272 100644 /* Variable length record files on VMS will have a stat size that includes record control characters that won't be included in the read size. */ #ifdef VMS -@@ -198,6 +205,49 @@ static int pchf_save_compare (const void *e1, const void *e2); +@@ -200,6 +207,49 @@ static int pchf_save_compare (const void *e1, const void *e2); static int pchf_compare (const void *d_p, const void *e_p); static bool check_file_against_entries (cpp_reader *, _cpp_file *, bool); @@ -81,7 +81,7 @@ index ea2cc23..ac17272 100644 /* Given a filename in FILE->PATH, with the empty string interpreted as , open it. -@@ -227,6 +277,43 @@ open_file (_cpp_file *file) +@@ -229,6 +279,43 @@ open_file (_cpp_file *file) } else file->fd = open (file->path, O_RDONLY | O_NOCTTY | O_BINARY, 0666); diff --git a/mingw-w64-gcc/0005-Windows-Don-t-ignore-native-system-header-dir.patch b/mingw-w64-gcc/0005-Windows-Don-t-ignore-native-system-header-dir.patch index 7d9e9c87f9..79118da2b6 100644 --- a/mingw-w64-gcc/0005-Windows-Don-t-ignore-native-system-header-dir.patch +++ b/mingw-w64-gcc/0005-Windows-Don-t-ignore-native-system-header-dir.patch @@ -11,7 +11,7 @@ diff --git a/gcc/config.gcc b/gcc/config.gcc index c835734..4638567 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -1699,7 +1699,10 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) +@@ -2169,7 +2169,10 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) tmake_file="${tmake_file} i386/t-mingw-w32" ;; esac @@ -20,7 +20,7 @@ index c835734..4638567 100644 + if test x$native_system_header_dir = x ; then + native_system_header_dir=/mingw/include + fi - target_gtfiles="\$(srcdir)/config/i386/winnt.c" + target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.c" extra_options="${extra_options} i386/cygming.opt i386/mingw.opt" case ${target} in -- diff --git a/mingw-w64-gcc/0006-Windows-New-feature-to-allow-overriding.patch b/mingw-w64-gcc/0006-Windows-New-feature-to-allow-overriding.patch index 9899224cc8..b1516b4dba 100644 --- a/mingw-w64-gcc/0006-Windows-New-feature-to-allow-overriding.patch +++ b/mingw-w64-gcc/0006-Windows-New-feature-to-allow-overriding.patch @@ -30,7 +30,7 @@ diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index 4ac5f68..f875e7b 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h -@@ -140,7 +140,7 @@ along with GCC; see the file COPYING3. If not see +@@ -165,7 +165,7 @@ along with GCC; see the file COPYING3. If not see #define REAL_LIBGCC_SPEC \ "%{mthreads:-lmingwthrd} -lmingw32 \ " SHARED_LIBGCC_SPEC " \ diff --git a/mingw-w64-gcc/0008-Prettify-linking-no-undefined.patch b/mingw-w64-gcc/0008-Prettify-linking-no-undefined.patch index a8ed4bdeff..9277fe7c2c 100644 --- a/mingw-w64-gcc/0008-Prettify-linking-no-undefined.patch +++ b/mingw-w64-gcc/0008-Prettify-linking-no-undefined.patch @@ -14,7 +14,7 @@ diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index 31eb986..f8ef020 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am -@@ -50,7 +50,7 @@ libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS) +@@ -49,7 +49,7 @@ libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS) cafexeclib_LTLIBRARIES = libcaf_single.la cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) libcaf_single_la_SOURCES = caf/single.c @@ -27,7 +27,7 @@ diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index 0f60e6e..8473026 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in -@@ -615,7 +615,7 @@ libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS) +@@ -738,7 +738,7 @@ libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS) cafexeclib_LTLIBRARIES = libcaf_single.la cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) libcaf_single_la_SOURCES = caf/single.c diff --git a/mingw-w64-gcc/0009-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch b/mingw-w64-gcc/0009-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch index 737975dcd2..f49c933879 100644 --- a/mingw-w64-gcc/0009-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch +++ b/mingw-w64-gcc/0009-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch @@ -25,7 +25,7 @@ index 9cd3fa7..9334f27 100644 /* The Intel API is flexible enough that we must allow aliasing with other vector types, and their scalar components. */ typedef float __m128 __attribute__ ((__vector_size__ (16), __may_alias__)); -@@ -1245,6 +1249,10 @@ do { \ +@@ -1316,6 +1316,10 @@ do { \ (row3) = __builtin_ia32_movhlps (__t3, __t2); \ } while (0) diff --git a/mingw-w64-gcc/0010-Fix-using-large-PCH.patch b/mingw-w64-gcc/0010-Fix-using-large-PCH.patch index af8ebec051..1a7a43c98b 100644 --- a/mingw-w64-gcc/0010-Fix-using-large-PCH.patch +++ b/mingw-w64-gcc/0010-Fix-using-large-PCH.patch @@ -25,7 +25,7 @@ diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c index aa17378..631d9c4 100644 --- a/gcc/config/i386/host-mingw32.c +++ b/gcc/config/i386/host-mingw32.c -@@ -42,9 +42,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void); +@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void); static inline void w32_error(const char*, const char*, int, const char*); @@ -35,7 +35,7 @@ index aa17378..631d9c4 100644 /* Granularity for reserving address space. */ static size_t va_granularity = 0x10000; -@@ -86,9 +83,6 @@ static void * +@@ -85,9 +82,6 @@ static void * mingw32_gt_pch_get_address (size_t size, int) { void* res; @@ -45,7 +45,7 @@ index aa17378..631d9c4 100644 /* FIXME: We let system determine base by setting first arg to NULL. Allocating at top of available address space avoids unnecessary -@@ -98,7 +92,7 @@ mingw32_gt_pch_get_address (size_t size, int) +@@ -94,7 +88,7 @@ mingw32_gt_pch_get_address (size_t size, int) If we allocate at bottom we need to reserve the address as early as possible and at the same point in each invocation. */ @@ -54,7 +54,7 @@ index aa17378..631d9c4 100644 MEM_RESERVE | MEM_TOP_DOWN, PAGE_NOACCESS); if (!res) -@@ -148,7 +142,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd, +@@ -144,7 +138,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd, /* Offset must be also be a multiple of allocation granularity for this to work. We can't change the offset. */ @@ -67,7 +67,7 @@ diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c index 03fbe7d..3a5df8a 100644 --- a/gcc/ggc-common.c +++ b/gcc/ggc-common.c -@@ -603,7 +603,9 @@ gt_pch_restore (FILE *f) +@@ -591,7 +591,9 @@ gt_pch_restore (FILE *f) size_t i; struct mmap_info mmi; int result; @@ -78,62 +78,62 @@ index 03fbe7d..3a5df8a 100644 /* Delete any deletable objects. This makes ggc_pch_read much faster, as it can be sure that no GCable objects remain other than the ones just read in. */ -@@ -611,20 +613,24 @@ gt_pch_restore (FILE *f) +@@ -601,20 +601,24 @@ gt_pch_restore (FILE *f) for (rti = *rt; rti->base != NULL; rti++) memset (rti->base, 0, rti->stride); - /* Read in all the scalar variables. */ + /* We need to read tables after mapping, or fatal_error will -+ segfault when gt_pch_use_address returns -1. Skip them for now. */ ++ segfault when gt_pch_use_address returns -1. Skip them for now. */ + pch_tabs_off = ftell(f); + + /* Skip all the scalar variables. */ for (rt = gt_pch_scalar_rtab; *rt; rt++) for (rti = *rt; rti->base != NULL; rti++) - if (fread (rti->base, rti->stride, 1, f) != 1) -- fatal_error (input_location, "can%'t read PCH file: %m"); +- fatal_error (input_location, "cannot read PCH file: %m"); + if (fseek (f, rti->stride, SEEK_CUR) != 0) -+ fatal_error (input_location, "can%'t read PCH file: %m"); ++ fatal_error (input_location, "cannot read PCH file: %m"); - /* Read in all the global pointers, in 6 easy loops. */ -+ /* Skip all the global pointers. */ ++ /* Skip all the global pointers. */ for (rt = gt_ggc_rtab; *rt; rt++) for (rti = *rt; rti->base != NULL; rti++) for (i = 0; i < rti->nelt; i++) - if (fread ((char *)rti->base + rti->stride * i, - sizeof (void *), 1, f) != 1) -- fatal_error (input_location, "can%'t read PCH file: %m"); +- fatal_error (input_location, "cannot read PCH file: %m"); - + if (fseek (f, sizeof (void *), SEEK_CUR) != 0) -+ fatal_error (input_location, "can%'t read PCH file: %m"); ++ fatal_error (input_location, "cannot read PCH file: %m"); + -+ /* mmi still has to be read now. */ ++ /* mmi still has to be read now. */ if (fread (&mmi, sizeof (mmi), 1, f) != 1) - fatal_error (input_location, "can%'t read PCH file: %m"); + fatal_error (input_location, "cannot read PCH file: %m"); -@@ -635,12 +641,35 @@ gt_pch_restore (FILE *f) +@@ -617,12 +629,35 @@ gt_pch_restore (FILE *f) if (result == 0) { if (fseek (f, mmi.offset, SEEK_SET) != 0 - || fread (mmi.preferred_base, mmi.size, 1, f) != 1) -- fatal_error (input_location, "can%'t read PCH file: %m"); +- fatal_error (input_location, "cannot read PCH file: %m"); + || fread (mmi.preferred_base, mmi.size, 1, f) != 1) -+ fatal_error (input_location, "can%'t read PCH file: %m"); ++ fatal_error (input_location, "cannot read PCH file: %m"); } else if (fseek (f, mmi.offset + mmi.size, SEEK_SET) != 0) - fatal_error (input_location, "can%'t read PCH file: %m"); -+ -+ /* File mapping done, read tables now. */ + fatal_error (input_location, "cannot read PCH file: %m"); ++ ++ /* File mapping done, read tables now. */ + pch_data_off = ftell(f); -+ ++ + if (fseek (f, pch_tabs_off, SEEK_SET) != 0) -+ fatal_error (input_location, "can%'t read PCH file: %m"); ++ fatal_error (input_location, "cannot read PCH file: %m"); + /* Read in all the scalar variables. */ + for (rt = gt_pch_scalar_rtab; *rt; rt++) + for (rti = *rt; rti->base != NULL; rti++) + if (fread (rti->base, rti->stride, 1, f) != 1) -+ fatal_error (input_location, "can%'t read PCH file: %m"); ++ fatal_error (input_location, "cannot read PCH file: %m"); + + /* Read in all the global pointers, in 6 easy loops. */ + for (rt = gt_ggc_rtab; *rt; rt++) @@ -141,10 +141,10 @@ index 03fbe7d..3a5df8a 100644 + for (i = 0; i < rti->nelt; i++) + if (fread ((char *)rti->base + rti->stride * i, + sizeof (void *), 1, f) != 1) -+ fatal_error (input_location, "can%'t read PCH file: %m"); ++ fatal_error (input_location, "cannot read PCH file: %m"); + + if (fseek (f, pch_data_off, SEEK_SET) != 0) -+ fatal_error (input_location, "can%'t read PCH file: %m"); ++ fatal_error (input_location, "cannot read PCH file: %m"); + ggc_pch_read (f, mmi.preferred_base); diff --git a/mingw-w64-gcc/0011-Enable-shared-gnat-implib.patch b/mingw-w64-gcc/0011-Enable-shared-gnat-implib.patch index 35841aef83..215053fdb3 100644 --- a/mingw-w64-gcc/0011-Enable-shared-gnat-implib.patch +++ b/mingw-w64-gcc/0011-Enable-shared-gnat-implib.patch @@ -16,7 +16,7 @@ diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile. index e1ca515..133807e 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in -@@ -2804,13 +2804,16 @@ gnatlib-shared-win32: +@@ -753,13 +753,16 @@ gnatlib-shared-win32: $(PICFLAG_FOR_TARGET) \ -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ diff --git a/mingw-w64-gcc/0012-Handle-spaces-in-path-for-default-manifest.patch b/mingw-w64-gcc/0012-Handle-spaces-in-path-for-default-manifest.patch index 8d71c87685..b5305a5b0a 100644 --- a/mingw-w64-gcc/0012-Handle-spaces-in-path-for-default-manifest.patch +++ b/mingw-w64-gcc/0012-Handle-spaces-in-path-for-default-manifest.patch @@ -1,6 +1,6 @@ --- a/gcc/gcc.c-original 2019-05-31 12:16:26.175109000 +0200 +++ b/gcc/gcc.c 2019-05-31 12:43:48.461954800 +0200 -@@ -6099,7 +6099,6 @@ +@@ -6129,7 +6129,6 @@ int save_arg_going; int save_delete_this_arg; int save_this_is_output_file; @@ -8,7 +8,7 @@ int save_input_from_pipe; int save_this_is_linker_script; const char *save_suffix_subst; -@@ -6117,7 +6116,6 @@ +@@ -6145,7 +6146,6 @@ save_arg_going = arg_going; save_delete_this_arg = delete_this_arg; save_this_is_output_file = this_is_output_file; @@ -16,16 +16,16 @@ save_this_is_linker_script = this_is_linker_script; save_input_from_pipe = input_from_pipe; save_suffix_subst = suffix_subst; -@@ -6148,13 +6146,15 @@ +@@ -6175,13 +6177,15 @@ argbuf.address ()); - + /* Pop the spec processing context. */ + const char *saved_library_file = this_is_library_file ? argbuf.address()[0] : NULL; argbuf.release (); argbuf = save_argbuf; + if (saved_library_file) + argbuf.safe_push (saved_library_file); - + arg_going = save_arg_going; delete_this_arg = save_delete_this_arg; this_is_output_file = save_this_is_output_file; @@ -33,9 +33,9 @@ this_is_linker_script = save_this_is_linker_script; input_from_pipe = save_input_from_pipe; suffix_subst = save_suffix_subst; -@@ -6226,8 +6226,9 @@ +@@ -6257,8 +6257,9 @@ /* p now points to just past the end of the spec function expression. */ - + funcval = eval_spec_function (func, args, soft_matched_part); - if (funcval != NULL && do_spec_1 (funcval, 0, NULL) < 0) + if (funcval != NULL && this_is_library_file == 0 && do_spec_1 (funcval, 0, NULL) < 0) diff --git a/mingw-w64-gcc/0014-gcc-9-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch b/mingw-w64-gcc/0014-gcc-9-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch index 6f5583c1f3..7e2f33acdb 100644 --- a/mingw-w64-gcc/0014-gcc-9-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch +++ b/mingw-w64-gcc/0014-gcc-9-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch @@ -59,7 +59,7 @@ diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c index 15f7e119d18..07740c4c403 100644 --- a/gcc/cgraphclones.c +++ b/gcc/cgraphclones.c -@@ -524,7 +524,8 @@ static GTY(()) hash_map *clone_fn_ids; +@@ -469,7 +469,8 @@ static GTY(()) hash_map *clone_fn_ids; each NAME) unspecified number. If clone numbering is not needed then the two argument clone_function_name should be used instead. Should not be called directly except for by @@ -69,7 +69,7 @@ index 15f7e119d18..07740c4c403 100644 tree clone_function_name_numbered (const char *name, const char *suffix) -@@ -563,12 +564,23 @@ clone_function_name (const char *name, const char *suffix, +@@ -509,12 +510,23 @@ clone_function_name (const char *name, const char *suffix, { size_t len = strlen (name); char *tmp_name, *prefix; diff --git a/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch b/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch new file mode 100644 index 0000000000..fc60b54664 --- /dev/null +++ b/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch @@ -0,0 +1,53 @@ +From 05b0bb43124b041da360ba9adcbaab8430be6d18 Mon Sep 17 00:00:00 2001 +From: Liu Hao +Date: Wed, 6 May 2020 21:49:18 +0800 +Subject: [PATCH] libgomp: Don't hard-code MS printf attributes + +--- + libgomp/libgomp.h | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h +index c98c1452bd4..0cc8443f6c2 100644 +--- a/libgomp/libgomp.h ++++ b/libgomp/libgomp.h +@@ -69,6 +69,13 @@ + # endif + #endif + ++#include ++#ifdef __MINGW_PRINTF_FORMAT ++#define PRINTF_FORMAT __MINGW_PRINTF_FORMAT ++#else ++#define PRINTF_FORMAT printf ++#endif ++ + #ifdef HAVE_ATTRIBUTE_VISIBILITY + # pragma GCC visibility push(hidden) + #endif +@@ -180,7 +187,7 @@ extern void gomp_aligned_free (void *); + + extern void gomp_vdebug (int, const char *, va_list); + extern void gomp_debug (int, const char *, ...) +- __attribute__ ((format (printf, 2, 3))); ++ __attribute__ ((format (PRINTF_FORMAT, 2, 3))); + #define gomp_vdebug(KIND, FMT, VALIST) \ + do { \ + if (__builtin_expect (gomp_debug_var, 0)) \ +@@ -193,11 +200,11 @@ extern void gomp_debug (int, const char *, ...) + } while (0) + extern void gomp_verror (const char *, va_list); + extern void gomp_error (const char *, ...) +- __attribute__ ((format (printf, 1, 2))); ++ __attribute__ ((format (PRINTF_FORMAT, 1, 2))); + extern void gomp_vfatal (const char *, va_list) + __attribute__ ((noreturn)); + extern void gomp_fatal (const char *, ...) +- __attribute__ ((noreturn, format (printf, 1, 2))); ++ __attribute__ ((noreturn, format (PRINTF_FORMAT, 1, 2))); + + struct gomp_task; + struct gomp_taskgroup; +-- +2.26.2 + diff --git a/mingw-w64-gcc/0130-libstdc++-in-out.patch b/mingw-w64-gcc/0130-libstdc++-in-out.patch index a5dc68cfe9..ba00be5993 100644 --- a/mingw-w64-gcc/0130-libstdc++-in-out.patch +++ b/mingw-w64-gcc/0130-libstdc++-in-out.patch @@ -1,23 +1,7 @@ -Microsoft-style code uses __in and __out to annotate function -parameters, which causes compilation in libstdc++ headers where they -try to use __in and __out as variable names. - -This patch fixes the issue by adding one more underscore to the -problematic variable names in libstdc++. - -The changes for this patch were generated with this command: - -sed -ri 's/\b(__in|__out)\b/_&/g' $(egrep -rl '\b(__in|__out)\b' libstdc++-v3/{include,config}) - -The GCC maintainers have been notified: - -https://gcc.gnu.org/ml/gcc-help/2017-05/msg00121.html - - -diff -aurp gcc-7.1.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h gcc-7.1.0/libstdc++-v3/config/locale/dragonfly/c_locale.h ---- gcc-7.1.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/config/locale/dragonfly/c_locale.h 2017-06-23 19:59:50.649617300 -0400 -@@ -55,7 +55,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h gcc-10.1.0/libstdc++-v3/config/locale/dragonfly/c_locale.h +--- gcc-10.1.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/config/locale/dragonfly/c_locale.h 2020-05-08 15:27:14.917453700 +0300 +@@ -55,7 +55,7 @@ // fall back to the unsafe vsprintf which, in general, can be dangerous // and should be avoided. inline int @@ -26,7 +10,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h gcc-7. const int __size __attribute__ ((__unused__)), const char* __fmt, ...) { -@@ -65,9 +65,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -65,9 +65,9 @@ __builtin_va_start(__args, __fmt); #if _GLIBCXX_USE_C99_STDIO @@ -38,10 +22,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/config/locale/dragonfly/c_locale.h gcc-7. #endif __builtin_va_end(__args); -diff -aurp gcc-7.1.0-orig/libstdc++-v3/config/locale/generic/c_locale.h gcc-7.1.0/libstdc++-v3/config/locale/generic/c_locale.h ---- gcc-7.1.0-orig/libstdc++-v3/config/locale/generic/c_locale.h 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/config/locale/generic/c_locale.h 2017-06-23 19:59:50.657617500 -0400 -@@ -53,7 +53,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/config/locale/generic/c_locale.h gcc-10.1.0/libstdc++-v3/config/locale/generic/c_locale.h +--- gcc-10.1.0-orig/libstdc++-v3/config/locale/generic/c_locale.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/config/locale/generic/c_locale.h 2020-05-08 15:27:14.920470300 +0300 +@@ -53,7 +53,7 @@ // fall back to the unsafe vsprintf which, in general, can be dangerous // and should be avoided. inline int @@ -50,7 +34,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/config/locale/generic/c_locale.h gcc-7.1. const int __size __attribute__((__unused__)), const char* __fmt, ...) { -@@ -71,9 +71,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -71,9 +71,9 @@ __builtin_va_start(__args, __fmt); #if _GLIBCXX_USE_C99_STDIO && !_GLIBCXX_HAVE_BROKEN_VSNPRINTF @@ -62,10 +46,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/config/locale/generic/c_locale.h gcc-7.1. #endif __builtin_va_end(__args); -diff -aurp gcc-7.1.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h gcc-7.1.0/libstdc++-v3/config/locale/gnu/c_locale.h ---- gcc-7.1.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/config/locale/gnu/c_locale.h 2017-06-23 19:59:50.666619200 -0400 -@@ -67,7 +67,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h gcc-10.1.0/libstdc++-v3/config/locale/gnu/c_locale.h +--- gcc-10.1.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/config/locale/gnu/c_locale.h 2020-05-08 15:27:14.923461200 +0300 +@@ -67,7 +67,7 @@ // and should be avoided. inline int __convert_from_v(const __c_locale& __cloc __attribute__ ((__unused__)), @@ -74,7 +58,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h gcc-7.1.0/li const int __size __attribute__ ((__unused__)), const char* __fmt, ...) { -@@ -89,9 +89,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -89,9 +89,9 @@ __builtin_va_start(__args, __fmt); #if _GLIBCXX_USE_C99_STDIO @@ -86,10 +70,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/config/locale/gnu/c_locale.h gcc-7.1.0/li #endif __builtin_va_end(__args); -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.h gcc-7.1.0/libstdc++-v3/include/bits/basic_string.h ---- gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.h 2017-03-14 10:51:19.000000000 -0400 -+++ gcc-7.1.0/libstdc++-v3/include/bits/basic_string.h 2017-06-23 19:59:50.199560200 -0400 -@@ -6141,13 +6141,13 @@ _GLIBCXX_END_NAMESPACE_CXX11 +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/basic_string.h gcc-10.1.0/libstdc++-v3/include/bits/basic_string.h +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/basic_string.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/basic_string.h 2020-05-08 15:27:14.939505400 +0300 +@@ -6517,13 +6517,13 @@ template<> basic_istream& @@ -105,10 +89,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.h gcc-7.1.0/lib wchar_t __delim); #endif -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-7.1.0/libstdc++-v3/include/bits/basic_string.tcc ---- gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc 2017-02-01 06:41:48.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/bits/basic_string.tcc 2017-06-23 19:59:50.217562400 -0400 -@@ -1462,7 +1462,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-10.1.0/libstdc++-v3/include/bits/basic_string.tcc +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/basic_string.tcc 2020-05-08 15:27:14.947409100 +0300 +@@ -1473,7 +1473,7 @@ // 21.3.7.9 basic_string::getline and operators template basic_istream<_CharT, _Traits>& @@ -117,7 +101,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-7.1.0/l basic_string<_CharT, _Traits, _Alloc>& __str) { typedef basic_istream<_CharT, _Traits> __istream_type; -@@ -1475,7 +1475,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1486,7 +1486,7 @@ __size_type __extracted = 0; typename __ios_base::iostate __err = __ios_base::goodbit; @@ -126,7 +110,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-7.1.0/l if (__cerb) { __try -@@ -1484,12 +1484,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1495,12 +1495,12 @@ __str.erase(); _CharT __buf[128]; __size_type __len = 0; @@ -142,7 +126,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-7.1.0/l while (__extracted < __n && !_Traits::eq_int_type(__c, __eof) -@@ -1503,17 +1503,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1514,17 +1514,17 @@ } __buf[__len++] = _Traits::to_char_type(__c); ++__extracted; @@ -163,7 +147,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-7.1.0/l __throw_exception_again; } __catch(...) -@@ -1521,20 +1521,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1532,20 +1532,20 @@ // _GLIBCXX_RESOLVE_LIB_DEFECTS // 91. Description of operator>> and getline() for string<> // might cause endless loop @@ -188,7 +172,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-7.1.0/l basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim) { typedef basic_istream<_CharT, _Traits> __istream_type; -@@ -1546,7 +1546,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1557,7 +1557,7 @@ __size_type __extracted = 0; const __size_type __n = __str.max_size(); typename __ios_base::iostate __err = __ios_base::goodbit; @@ -197,7 +181,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-7.1.0/l if (__cerb) { __try -@@ -1554,7 +1554,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1565,7 +1565,7 @@ __str.erase(); const __int_type __idelim = _Traits::to_int_type(__delim); const __int_type __eof = _Traits::eof(); @@ -206,7 +190,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-7.1.0/l while (__extracted < __n && !_Traits::eq_int_type(__c, __eof) -@@ -1562,7 +1562,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1573,7 +1573,7 @@ { __str += _Traits::to_char_type(__c); ++__extracted; @@ -215,7 +199,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-7.1.0/l } if (_Traits::eq_int_type(__c, __eof)) -@@ -1570,14 +1570,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1581,14 +1581,14 @@ else if (_Traits::eq_int_type(__c, __idelim)) { ++__extracted; @@ -232,7 +216,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-7.1.0/l __throw_exception_again; } __catch(...) -@@ -1585,14 +1585,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1596,14 +1596,14 @@ // _GLIBCXX_RESOLVE_LIB_DEFECTS // 91. Description of operator>> and getline() for string<> // might cause endless loop @@ -250,9 +234,9 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/basic_string.tcc gcc-7.1.0/l } // Inhibit implicit instantiations for required instantiations, -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-7.1.0/libstdc++-v3/include/bits/istream.tcc ---- gcc-7.1.0-orig/libstdc++-v3/include/bits/istream.tcc 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/bits/istream.tcc 2017-06-23 19:59:50.230563400 -0400 +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-10.1.0/libstdc++-v3/include/bits/istream.tcc +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/istream.tcc 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/istream.tcc 2020-05-08 15:27:14.962363600 +0300 @@ -44,21 +44,21 @@ template @@ -434,10 +418,30 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/istream.tcc gcc-7.1.0/libstd } // Inhibit implicit instantiations for required instantiations, -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_conv.h gcc-7.1.0/libstdc++-v3/include/bits/locale_conv.h ---- gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_conv.h 2017-03-16 11:27:51.000000000 -0400 -+++ gcc-7.1.0/libstdc++-v3/include/bits/locale_conv.h 2017-06-23 19:59:50.240565700 -0400 -@@ -249,10 +249,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/iterator_concepts.h gcc-10.1.0/libstdc++-v3/include/bits/iterator_concepts.h +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/iterator_concepts.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/iterator_concepts.h 2020-05-08 17:14:06.085050500 +0300 +@@ -443,13 +443,13 @@ + using __iter_concept = typename __iter_concept_impl<_Iter>::type; + + template +- concept __indirectly_readable_impl = requires(const _In __in) ++ concept __indirectly_readable_impl = requires(const _In ___in) + { + typename iter_value_t<_In>; + typename iter_reference_t<_In>; + typename iter_rvalue_reference_t<_In>; +- { *__in } -> same_as>; +- { ranges::iter_move(__in) } -> same_as>; ++ { *___in } -> same_as>; ++ { ranges::iter_move(___in) } -> same_as>; + } + && common_reference_with&&, iter_value_t<_In>&> + && common_reference_with&&, +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/locale_conv.h gcc-10.1.0/libstdc++-v3/include/bits/locale_conv.h +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/locale_conv.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/locale_conv.h 2020-05-08 15:27:14.966323000 +0300 +@@ -315,10 +315,10 @@ { if (!_M_with_cvtstate) _M_state = state_type(); @@ -451,7 +455,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_conv.h gcc-7.1.0/libs if (_M_with_strings) return _M_wide_err_string; __throw_range_error("wstring_convert::from_bytes"); -@@ -285,10 +285,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 +@@ -351,10 +351,10 @@ { if (!_M_with_cvtstate) _M_state = state_type(); @@ -465,8 +469,8 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_conv.h gcc-7.1.0/libs if (_M_with_strings) return _M_byte_err_string; __throw_range_error("wstring_convert::to_bytes"); -@@ -378,13 +378,13 @@ _GLIBCXX_END_NAMESPACE_CXX11 - { return _M_buf && _M_conv_put() && _M_buf->pubsync() ? 0 : -1; } +@@ -447,13 +447,13 @@ + { return _M_buf && _M_conv_put() && !_M_buf->pubsync() ? 0 : -1; } typename _Wide_streambuf::int_type - overflow(typename _Wide_streambuf::int_type __out) @@ -483,10 +487,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_conv.h gcc-7.1.0/libs } typename _Wide_streambuf::int_type -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-7.1.0/libstdc++-v3/include/bits/locale_facets.h ---- gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_facets.h 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/bits/locale_facets.h 2017-06-23 19:59:50.258067400 -0400 -@@ -1984,7 +1984,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-10.1.0/libstdc++-v3/include/bits/locale_facets.h +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/locale_facets.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/locale_facets.h 2020-05-08 15:27:14.978314200 +0300 +@@ -1988,7 +1988,7 @@ * 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. * @@ -495,7 +499,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-7.1.0/li * @param __end End of input stream. * @param __io Source of locale and flags. * @param __err Error flags to set. -@@ -1992,9 +1992,9 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL +@@ -1996,9 +1996,9 @@ * @return Iterator after reading. */ iter_type @@ -507,7 +511,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-7.1.0/li //@{ /** -@@ -2021,7 +2021,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL +@@ -2025,7 +2025,7 @@ * Otherwise, sets err to ios_base::failbit and leaves @a v unaltered. * Sets err to ios_base::eofbit if the stream is emptied. * @@ -516,7 +520,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-7.1.0/li * @param __end End of input stream. * @param __io Source of locale and flags. * @param __err Error flags to set. -@@ -2029,35 +2029,35 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL +@@ -2033,35 +2033,35 @@ * @return Iterator after reading. */ iter_type @@ -564,7 +568,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-7.1.0/li #endif //@} -@@ -2081,7 +2081,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL +@@ -2085,7 +2085,7 @@ * Otherwise, sets err to ios_base::failbit and leaves @a v unaltered. * Sets err to ios_base::eofbit if the stream is emptied. * @@ -573,7 +577,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-7.1.0/li * @param __end End of input stream. * @param __io Source of locale and flags. * @param __err Error flags to set. -@@ -2089,19 +2089,19 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL +@@ -2093,19 +2093,19 @@ * @return Iterator after reading. */ iter_type @@ -599,7 +603,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-7.1.0/li //@} /** -@@ -2124,7 +2124,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL +@@ -2128,7 +2128,7 @@ * Otherwise, sets err to ios_base::failbit and leaves @a v unaltered. * Sets err to ios_base::eofbit if the stream is emptied. * @@ -608,7 +612,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-7.1.0/li * @param __end End of input stream. * @param __io Source of locale and flags. * @param __err Error flags to set. -@@ -2132,9 +2132,9 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL +@@ -2136,9 +2136,9 @@ * @return Iterator after reading. */ iter_type @@ -620,10 +624,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/locale_facets.h gcc-7.1.0/li protected: /// Destructor. -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/ostream.tcc gcc-7.1.0/libstdc++-v3/include/bits/ostream.tcc ---- gcc-7.1.0-orig/libstdc++-v3/include/bits/ostream.tcc 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/bits/ostream.tcc 2017-06-23 19:59:50.269068600 -0400 -@@ -318,10 +318,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/ostream.tcc gcc-10.1.0/libstdc++-v3/include/bits/ostream.tcc +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/ostream.tcc 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/ostream.tcc 2020-05-08 15:27:14.983277300 +0300 +@@ -318,10 +318,10 @@ template basic_ostream<_CharT, _Traits>& @@ -636,7 +640,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/ostream.tcc gcc-7.1.0/libstd else { // _GLIBCXX_RESOLVE_LIB_DEFECTS -@@ -339,18 +339,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -339,18 +339,18 @@ _CharT *__ws = __pg.__get(); for (size_t __i = 0; __i < __clen; ++__i) @@ -660,10 +664,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/ostream.tcc gcc-7.1.0/libstd } // Inhibit implicit instantiations for required instantiations, -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/ostream_insert.h gcc-7.1.0/libstdc++-v3/include/bits/ostream_insert.h ---- gcc-7.1.0-orig/libstdc++-v3/include/bits/ostream_insert.h 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/bits/ostream_insert.h 2017-06-23 19:59:50.277569900 -0400 -@@ -41,31 +41,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/ostream_insert.h gcc-10.1.0/libstdc++-v3/include/bits/ostream_insert.h +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/ostream_insert.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/ostream_insert.h 2020-05-08 15:27:14.987293800 +0300 +@@ -41,31 +41,31 @@ template inline void @@ -702,7 +706,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/ostream_insert.h gcc-7.1.0/l break; } } -@@ -73,43 +73,43 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -73,43 +73,43 @@ template basic_ostream<_CharT, _Traits>& @@ -760,10 +764,179 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/ostream_insert.h gcc-7.1.0/l } // Inhibit implicit instantiations for required instantiations, -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.h gcc-7.1.0/libstdc++-v3/include/bits/regex.h ---- gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.h 2017-03-01 22:43:49.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/bits/regex.h 2017-06-23 19:59:50.295573100 -0400 -@@ -1779,7 +1779,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_algo.h gcc-10.1.0/libstdc++-v3/include/bits/ranges_algo.h +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_algo.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/ranges_algo.h 2020-05-08 17:28:57.317446100 +0300 +@@ -1750,7 +1750,7 @@ + && indirectly_copyable<_Iter, _Out> + && uniform_random_bit_generator> + _Out +- operator()(_Iter __first, _Sent __last, _Out __out, ++ operator()(_Iter __first, _Sent __last, _Out ___out, + iter_difference_t<_Iter> __n, _Gen&& __g) const + { + if constexpr (forward_iterator<_Iter>) +@@ -1759,7 +1759,7 @@ + // which may take linear time. + auto __lasti = ranges::next(__first, __last); + return std::sample(std::move(__first), std::move(__lasti), +- std::move(__out), __n, std::forward<_Gen>(__g)); ++ std::move(___out), __n, std::forward<_Gen>(__g)); + } + else + { +@@ -1770,7 +1770,7 @@ + iter_difference_t<_Iter> __sample_sz = 0; + while (__first != __last && __sample_sz != __n) + { +- __out[__sample_sz++] = *__first; ++ ___out[__sample_sz++] = *__first; + ++__first; + } + for (auto __pop_sz = __sample_sz; __first != __last; +@@ -1778,9 +1778,9 @@ + { + const auto __k = __d(__g, __param_type{0, __pop_sz}); + if (__k < __n) +- __out[__k] = *__first; ++ ___out[__k] = *__first; + } +- return __out + __sample_sz; ++ return ___out + __sample_sz; + } + } + +@@ -1789,11 +1789,11 @@ + && indirectly_copyable, _Out> + && uniform_random_bit_generator> + _Out +- operator()(_Range&& __r, _Out __out, ++ operator()(_Range&& __r, _Out ___out, + range_difference_t<_Range> __n, _Gen&& __g) const + { + return (*this)(ranges::begin(__r), ranges::end(__r), +- std::move(__out), __n, ++ std::move(___out), __n, + std::forward<_Gen>(__g)); + } + }; +@@ -2170,11 +2170,11 @@ + projected, _Proj2>> + constexpr partial_sort_copy_result, + borrowed_iterator_t<_Range2>> +- operator()(_Range1&& __r, _Range2&& __out, _Comp __comp = {}, ++ operator()(_Range1&& __r, _Range2&& ___out, _Comp __comp = {}, + _Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const + { + return (*this)(ranges::begin(__r), ranges::end(__r), +- ranges::begin(__out), ranges::end(__out), ++ ranges::begin(___out), ranges::end(___out), + std::move(__comp), + std::move(__proj1), std::move(__proj2)); + } +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) + { +- auto [__in, __out] ++ auto [___in, ___out] + = ranges::__copy_or_move(std::move(__first).base(), + std::move(__last).base(), + std::move(__result)); +- return {move_iterator{std::move(__in)}, std::move(__out)}; ++ return {move_iterator{std::move(___in)}, std::move(___out)}; + } + else if constexpr (__reverse_p) + { +- auto [__in,__out] ++ auto [___in,___out] + = ranges::__copy_or_move_backward<_IsMove>(__last.base(), + __first.base(), + __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) + { +- 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))}; + } + else if constexpr (sized_sentinel_for<_Sent, _Iter>) + { +@@ -361,22 +361,22 @@ + && __detail::__is_reverse_iterator<_Out>); + if constexpr (__reverse_p) + { +- auto [__in,__out] ++ auto [___in,___out] + = ranges::__copy_or_move<_IsMove>(__last.base(), + __first.base(), + __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) + { +- 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))}; + } + else if constexpr (sized_sentinel_for<_Sent, _Iter>) + { +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_uninitialized.h gcc-10.1.0/libstdc++-v3/include/bits/ranges_uninitialized.h +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_uninitialized.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/ranges_uninitialized.h 2020-05-08 17:17:52.556144400 +0300 +@@ -361,10 +361,10 @@ + { + auto __d1 = __ilast - __ifirst; + auto __d2 = __olast - __ofirst; +- auto [__in, __out] ++ auto [___in, ___out] + = ranges::copy_n(std::make_move_iterator(std::move(__ifirst)), + std::min(__d1, __d2), __ofirst); +- return {std::move(__in).base(), __out}; ++ return {std::move(___in).base(), ___out}; + } + else + { +@@ -412,10 +412,10 @@ + iter_rvalue_reference_t<_Iter>>) + { + auto __d = __olast - __ofirst; +- auto [__in, __out] ++ auto [___in, ___out] + = ranges::copy_n(std::make_move_iterator(std::move(__ifirst)), + std::min(__n, __d), __ofirst); +- return {std::move(__in).base(), __out}; ++ return {std::move(___in).base(), ___out}; + } + else + { +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/regex.h gcc-10.1.0/libstdc++-v3/include/bits/regex.h +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/regex.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/regex.h 2020-05-08 15:27:14.996242100 +0300 +@@ -1946,7 +1946,7 @@ */ template _Out_iter @@ -772,7 +945,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.h gcc-7.1.0/libstdc++- const char_type* __fmt_last, match_flag_type __flags = regex_constants::format_default) const; -@@ -1788,10 +1788,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 +@@ -1955,10 +1955,10 @@ */ template _Out_iter @@ -785,7 +958,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.h gcc-7.1.0/libstdc++- __flags); } -@@ -2279,46 +2279,46 @@ _GLIBCXX_END_NAMESPACE_CXX11 +@@ -2460,46 +2460,46 @@ /** * @brief Search for a regular expression within a range for multiple times, and replace the matched parts through filling a format string. @@ -839,19 +1012,19 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.h gcc-7.1.0/libstdc++- const basic_regex<_Ch_type, _Rx_traits>& __e, const _Ch_type* __fmt, regex_constants::match_flag_type __flags -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-7.1.0/libstdc++-v3/include/bits/regex.tcc ---- gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.tcc 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/bits/regex.tcc 2017-06-23 19:59:50.307074100 -0400 -@@ -353,7 +353,7 @@ - template +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-10.1.0/libstdc++-v3/include/bits/regex.tcc +--- gcc-10.1.0-orig/libstdc++-v3/include/bits/regex.tcc 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/bits/regex.tcc 2020-05-08 16:11:37.031430400 +0300 +@@ -352,7 +352,7 @@ template - _Out_iter match_results<_Bi_iter, _Alloc>:: + _Out_iter + match_results<_Bi_iter, _Alloc>:: - format(_Out_iter __out, + format(_Out_iter ___out, 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 -@@ -368,7 +368,7 @@ +@@ -367,7 +367,7 @@ { auto& __sub = (*this)[__idx]; if (__sub.matched) @@ -860,7 +1033,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-7.1.0/libstdc+ }; if (__flags & regex_constants::format_sed) -@@ -382,7 +382,7 @@ +@@ -381,7 +381,7 @@ if (__fctyp.is(__ctype_type::digit, *__fmt_first)) __output(__traits.value(*__fmt_first, 10)); else @@ -869,7 +1042,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-7.1.0/libstdc+ continue; } if (*__fmt_first == '\\') -@@ -395,10 +395,10 @@ +@@ -394,10 +394,10 @@ __output(0); continue; } @@ -882,7 +1055,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-7.1.0/libstdc+ } else { -@@ -408,7 +408,7 @@ +@@ -407,7 +407,7 @@ if (__next == __fmt_last) break; @@ -891,7 +1064,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-7.1.0/libstdc+ auto __eat = [&](char __ch) -> bool { -@@ -421,22 +421,22 @@ +@@ -420,22 +420,22 @@ }; if (++__next == __fmt_last) @@ -918,7 +1091,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-7.1.0/libstdc+ } else if (__fctyp.is(__ctype_type::digit, *__next)) { -@@ -451,18 +451,18 @@ +@@ -450,18 +450,18 @@ __output(__num); } else @@ -941,7 +1114,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-7.1.0/libstdc+ const basic_regex<_Ch_type, _Rx_traits>& __e, const _Ch_type* __fmt, regex_constants::match_flag_type __flags) -@@ -473,7 +473,7 @@ +@@ -472,7 +472,7 @@ if (__i == __end) { if (!(__flags & regex_constants::format_no_copy)) @@ -950,7 +1123,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-7.1.0/libstdc+ } else { -@@ -482,17 +482,17 @@ +@@ -481,17 +481,17 @@ for (; __i != __end; ++__i) { if (!(__flags & regex_constants::format_no_copy)) @@ -973,10 +1146,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/regex.tcc gcc-7.1.0/libstdc+ } template _RandomAccessIterator __sample(_InputIterator __first, _InputIterator __last, input_iterator_tag, @@ -985,7 +1158,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/stl_algo.h gcc-7.1.0/libstdc _Size __n, _UniformRandomBitGenerator&& __g) { using __distrib_type = uniform_int_distribution<_Size>; -@@ -5706,7 +5706,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO +@@ -5767,7 +5767,7 @@ _Size __sample_sz = 0; while (__first != __last && __sample_sz != __n) { @@ -994,7 +1167,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/stl_algo.h gcc-7.1.0/libstdc ++__first; } for (auto __pop_sz = __sample_sz; __first != __last; -@@ -5714,9 +5714,9 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO +@@ -5775,9 +5775,9 @@ { const auto __k = __d(__g, __param_type{0, __pop_sz}); if (__k < __n) @@ -1006,7 +1179,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/stl_algo.h gcc-7.1.0/libstdc } /// Selection sampling algorithm. -@@ -5725,7 +5725,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO +@@ -5786,7 +5786,7 @@ _OutputIterator __sample(_ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag, @@ -1015,7 +1188,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/stl_algo.h gcc-7.1.0/libstdc _Size __n, _UniformRandomBitGenerator&& __g) { using __distrib_type = uniform_int_distribution<_Size>; -@@ -5754,7 +5754,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO +@@ -5815,7 +5815,7 @@ --__unsampled_sz; if (__p.first < __n) { @@ -1024,7 +1197,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/stl_algo.h gcc-7.1.0/libstdc --__n; } -@@ -5765,7 +5765,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO +@@ -5826,7 +5826,7 @@ --__unsampled_sz; if (__p.second < __n) { @@ -1033,7 +1206,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/stl_algo.h gcc-7.1.0/libstdc --__n; } -@@ -5778,10 +5778,10 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO +@@ -5839,10 +5839,10 @@ for (; __n != 0; ++__first) if (__d(__g, __param_type{0, --__unsampled_sz}) < __n) { @@ -1046,7 +1219,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/stl_algo.h gcc-7.1.0/libstdc } #if __cplusplus > 201402L -@@ -5791,7 +5791,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO +@@ -5852,7 +5852,7 @@ typename _Distance, typename _UniformRandomBitGenerator> _SampleIterator sample(_PopulationIterator __first, _PopulationIterator __last, @@ -1055,7 +1228,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/stl_algo.h gcc-7.1.0/libstdc _UniformRandomBitGenerator&& __g) { using __pop_cat = typename -@@ -5809,7 +5809,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO +@@ -5871,7 +5871,7 @@ typename iterator_traits<_PopulationIterator>::difference_type __d = __n; return _GLIBCXX_STD_A:: @@ -1064,10 +1237,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/bits/stl_algo.h gcc-7.1.0/libstdc std::forward<_UniformRandomBitGenerator>(__g)); } #endif // C++17 -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/experimental/algorithm gcc-7.1.0/libstdc++-v3/include/experimental/algorithm ---- gcc-7.1.0-orig/libstdc++-v3/include/experimental/algorithm 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/experimental/algorithm 2017-06-23 19:59:50.420588000 -0400 -@@ -59,7 +59,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/experimental/algorithm gcc-10.1.0/libstdc++-v3/include/experimental/algorithm +--- gcc-10.1.0-orig/libstdc++-v3/include/experimental/algorithm 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/experimental/algorithm 2020-05-08 16:12:28.617088800 +0300 +@@ -59,7 +59,7 @@ typename _Distance, typename _UniformRandomNumberGenerator> _SampleIterator sample(_PopulationIterator __first, _PopulationIterator __last, @@ -1076,19 +1249,144 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/experimental/algorithm gcc-7.1.0/ _UniformRandomNumberGenerator&& __g) { using __pop_cat = typename -@@ -77,7 +77,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION - "sample size must be an integer type"); +@@ -78,7 +78,7 @@ typename iterator_traits<_PopulationIterator>::difference_type __d = __n; -- return std::__sample(__first, __last, __pop_cat{}, __out, __samp_cat{}, -+ return std::__sample(__first, __last, __pop_cat{}, ___out, __samp_cat{}, - __d, - std::forward<_UniformRandomNumberGenerator>(__g)); + return _GLIBCXX_STD_A:: +- __sample(__first, __last, __pop_cat{}, __out, __samp_cat{}, __d, ++ __sample(__first, __last, __pop_cat{}, ___out, __samp_cat{}, __d, + std::forward<_UniformRandomNumberGenerator>(__g)); } -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/algorithm gcc-7.1.0/libstdc++-v3/include/ext/algorithm ---- gcc-7.1.0-orig/libstdc++-v3/include/ext/algorithm 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/ext/algorithm 2017-06-23 19:59:50.433089200 -0400 -@@ -265,7 +265,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + +@@ -86,9 +86,9 @@ + typename _Distance> + inline _SampleIterator + sample(_PopulationIterator __first, _PopulationIterator __last, +- _SampleIterator __out, _Distance __n) ++ _SampleIterator ___out, _Distance __n) + { +- return experimental::sample(__first, __last, __out, __n, ++ return experimental::sample(__first, __last, ___out, __n, + _S_randint_engine()); + } + +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/experimental/internet gcc-10.1.0/libstdc++-v3/include/experimental/internet +--- gcc-10.1.0-orig/libstdc++-v3/include/experimental/internet 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/experimental/internet 2020-05-08 17:30:25.005879100 +0300 +@@ -740,9 +740,9 @@ + if (__p == nullptr) + return __make_address_v6(__str, nullptr, __ec); + char __buf[64]; +- char* __out = __buf; ++ char* ___out = __buf; + bool __skip_leading_zero = true; +- while (__str < __p && __out < std::end(__buf)) ++ while (__str < __p && ___out < std::end(__buf)) + { + if (!__skip_leading_zero || *__str != '0') + { +@@ -750,15 +750,15 @@ + __skip_leading_zero = true; + else + __skip_leading_zero = false; +- *__out = *__str; ++ *___out = *__str; + } + __str++; + } +- if (__out == std::end(__buf)) ++ if (___out == std::end(__buf)) + __ec = std::make_error_code(std::errc::invalid_argument); + else + { +- *__out = '\0'; ++ *___out = '\0'; + return __make_address_v6(__buf, __p + 1, __ec); + } + } +@@ -774,10 +774,10 @@ + if (__pos == string::npos) + return __make_address_v6(__str.c_str(), nullptr, __ec); + char __buf[64]; +- char* __out = __buf; ++ char* ___out = __buf; + bool __skip_leading_zero = true; + size_t __n = 0; +- while (__n < __pos && __out < std::end(__buf)) ++ while (__n < __pos && ___out < std::end(__buf)) + { + if (!__skip_leading_zero || __str[__n] != '0') + { +@@ -785,15 +785,15 @@ + __skip_leading_zero = true; + else + __skip_leading_zero = false; +- *__out = __str[__n]; ++ *___out = __str[__n]; + } + __n++; + } +- if (__out == std::end(__buf)) ++ if (___out == std::end(__buf)) + __ec = std::make_error_code(std::errc::invalid_argument); + else + { +- *__out = '\0'; ++ *___out = '\0'; + return __make_address_v6(__buf, __str.c_str() + __pos + 1, __ec); + } + } +@@ -806,20 +806,20 @@ + make_address_v6(string_view __str, error_code& __ec) noexcept + { + char __buf[64]; +- char* __out = __buf; ++ char* ___out = __buf; + char* __scope = nullptr; + bool __skip_leading_zero = true; + size_t __n = 0; +- while (__n < __str.length() && __out < std::end(__buf)) ++ while (__n < __str.length() && ___out < std::end(__buf)) + { + if (__str[__n] == '%') + { + if (__scope) +- __out = std::end(__buf); ++ ___out = std::end(__buf); + else + { +- *__out = '\0'; +- __scope = ++__out; ++ *___out = '\0'; ++ __scope = ++___out; + __skip_leading_zero = true; + } + } +@@ -829,16 +829,16 @@ + __skip_leading_zero = true; + else + __skip_leading_zero = false; +- *__out = __str[__n]; +- __out++; ++ *___out = __str[__n]; ++ ___out++; + } + __n++; + } +- if (__out == std::end(__buf)) ++ if (___out == std::end(__buf)) + __ec = std::make_error_code(std::errc::invalid_argument); + else + { +- *__out = '\0'; ++ *___out = '\0'; + return __make_address_v6(__buf, __scope, __ec); + } + } +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/ext/algorithm gcc-10.1.0/libstdc++-v3/include/ext/algorithm +--- gcc-10.1.0-orig/libstdc++-v3/include/ext/algorithm 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/ext/algorithm 2020-05-08 15:27:15.031175400 +0300 +@@ -258,7 +258,7 @@ typename _Distance> _OutputIterator random_sample_n(_ForwardIterator __first, _ForwardIterator __last, @@ -1097,7 +1395,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/algorithm gcc-7.1.0/libstdc++ { // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) -@@ -280,14 +280,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -273,14 +273,14 @@ { if ((std::rand() % __remaining) < __m) { @@ -1115,7 +1413,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/algorithm gcc-7.1.0/libstdc++ } /** -@@ -299,7 +299,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -292,7 +292,7 @@ typename _Distance, typename _RandomNumberGenerator> _OutputIterator random_sample_n(_ForwardIterator __first, _ForwardIterator __last, @@ -1124,7 +1422,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/algorithm gcc-7.1.0/libstdc++ _RandomNumberGenerator& __rand) { // concept requirements -@@ -317,44 +317,44 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -310,44 +310,44 @@ { if (__rand(__remaining) < __m) { @@ -1177,7 +1475,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/algorithm gcc-7.1.0/libstdc++ _RandomNumberGenerator& __rand, const _Distance __n) { -@@ -365,17 +365,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -358,17 +358,17 @@ _Distance __m = 0; _Distance __t = __n; for ( ; __first != __last && __m < __n; ++__m, ++__first) @@ -1198,10 +1496,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/algorithm gcc-7.1.0/libstdc++ } /** -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp gcc-7.1.0/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp ---- gcc-7.1.0-orig/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp 2017-06-23 19:59:50.443591000 -0400 -@@ -57,9 +57,9 @@ namespace __gnu_pbds +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp gcc-10.1.0/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp +--- gcc-10.1.0-orig/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp 2020-05-08 15:27:15.041151800 +0300 +@@ -57,9 +57,9 @@ // Need std::pair ostream extractor. template inline std::basic_ostream<_CharT, _Traits>& @@ -1213,10 +1511,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.h #define PB_DS_CLASS_T_DEC \ template -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/random.tcc gcc-7.1.0/libstdc++-v3/include/ext/random.tcc ---- gcc-7.1.0-orig/libstdc++-v3/include/ext/random.tcc 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/ext/random.tcc 2017-06-23 19:59:50.458593100 -0400 -@@ -207,38 +207,38 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/ext/random.tcc gcc-10.1.0/libstdc++-v3/include/ext/random.tcc +--- gcc-10.1.0-orig/libstdc++-v3/include/ext/random.tcc 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/ext/random.tcc 2020-05-08 15:27:15.056090400 +0300 +@@ -208,38 +208,38 @@ namespace { template @@ -1273,10 +1571,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/random.tcc gcc-7.1.0/libstdc+ } -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-7.1.0/libstdc++-v3/include/ext/vstring.tcc ---- gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/ext/vstring.tcc 2017-06-23 19:59:50.469594000 -0400 -@@ -549,7 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-10.1.0/libstdc++-v3/include/ext/vstring.tcc +--- gcc-10.1.0-orig/libstdc++-v3/include/ext/vstring.tcc 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/ext/vstring.tcc 2020-05-08 15:27:15.065086300 +0300 +@@ -549,7 +549,7 @@ template class _Base> basic_istream<_CharT, _Traits>& @@ -1285,7 +1583,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-7.1.0/libstdc __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>& __str) { -@@ -564,7 +564,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -564,7 +564,7 @@ __size_type __extracted = 0; typename __ios_base::iostate __err = __ios_base::goodbit; @@ -1294,7 +1592,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-7.1.0/libstdc if (__cerb) { __try -@@ -573,12 +573,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -573,12 +573,12 @@ __str.erase(); _CharT __buf[128]; __size_type __len = 0; @@ -1310,7 +1608,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-7.1.0/libstdc while (__extracted < __n && !_Traits::eq_int_type(__c, __eof) -@@ -592,17 +592,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -592,17 +592,17 @@ } __buf[__len++] = _Traits::to_char_type(__c); ++__extracted; @@ -1331,7 +1629,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-7.1.0/libstdc __throw_exception_again; } __catch(...) -@@ -610,21 +610,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -610,21 +610,21 @@ // _GLIBCXX_RESOLVE_LIB_DEFECTS // 91. Description of operator>> and getline() for string<> // might cause endless loop @@ -1357,7 +1655,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-7.1.0/libstdc __gnu_cxx::__versa_string<_CharT, _Traits, _Alloc, _Base>& __str, _CharT __delim) { -@@ -638,7 +638,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -638,7 +638,7 @@ __size_type __extracted = 0; const __size_type __n = __str.max_size(); typename __ios_base::iostate __err = __ios_base::goodbit; @@ -1366,7 +1664,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-7.1.0/libstdc if (__cerb) { __try -@@ -649,7 +649,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -649,7 +649,7 @@ __size_type __len = 0; const __int_type __idelim = _Traits::to_int_type(__delim); const __int_type __eof = _Traits::eof(); @@ -1375,7 +1673,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-7.1.0/libstdc while (__extracted < __n && !_Traits::eq_int_type(__c, __eof) -@@ -662,7 +662,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -662,7 +662,7 @@ } __buf[__len++] = _Traits::to_char_type(__c); ++__extracted; @@ -1384,7 +1682,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-7.1.0/libstdc } __str.append(__buf, __len); -@@ -671,14 +671,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -671,14 +671,14 @@ else if (_Traits::eq_int_type(__c, __idelim)) { ++__extracted; @@ -1401,7 +1699,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-7.1.0/libstdc __throw_exception_again; } __catch(...) -@@ -686,14 +686,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -686,14 +686,14 @@ // _GLIBCXX_RESOLVE_LIB_DEFECTS // 91. Description of operator>> and getline() for string<> // might cause endless loop @@ -1419,10 +1717,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/ext/vstring.tcc gcc-7.1.0/libstdc } _GLIBCXX_END_NAMESPACE_VERSION -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/algo.h gcc-7.1.0/libstdc++-v3/include/parallel/algo.h ---- gcc-7.1.0-orig/libstdc++-v3/include/parallel/algo.h 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/parallel/algo.h 2017-06-23 19:59:50.486095800 -0400 -@@ -289,67 +289,67 @@ namespace __parallel +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/parallel/algo.h gcc-10.1.0/libstdc++-v3/include/parallel/algo.h +--- gcc-10.1.0-orig/libstdc++-v3/include/parallel/algo.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/parallel/algo.h 2020-05-08 16:14:08.758653700 +0300 +@@ -289,67 +289,67 @@ // Sequential fallback template inline _OutputIterator @@ -1454,12 +1752,12 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/algo.h gcc-7.1.0/libstdc + { return _GLIBCXX_STD_A::unique_copy(__begin, __last, ___out, __pred); } // Parallel unique_copy for random access iterators - template - RandomAccessOutputIterator + _RandomAccessOutputIterator __unique_copy_switch(_RAIter __begin, _RAIter __last, -- RandomAccessOutputIterator __out, _Predicate __pred, -+ RandomAccessOutputIterator ___out, _Predicate __pred, +- _RandomAccessOutputIterator __out, _Predicate __pred, ++ _RandomAccessOutputIterator ___out, _Predicate __pred, random_access_iterator_tag, random_access_iterator_tag) { if (_GLIBCXX_PARALLEL_CONDITION( @@ -1505,7 +1803,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/algo.h gcc-7.1.0/libstdc } // Sequential fallback -@@ -358,9 +358,9 @@ namespace __parallel +@@ -358,9 +358,9 @@ inline _OutputIterator set_union(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2, @@ -1517,7 +1815,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/algo.h gcc-7.1.0/libstdc // Sequential fallback template inline _OutputIterator set_union(_IIter1 __begin1, _IIter1 __end1, @@ -1551,7 +1849,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/algo.h gcc-7.1.0/libstdc } // Public interface -@@ -431,13 +431,13 @@ namespace __parallel +@@ -431,13 +431,13 @@ inline _OutputIterator set_union(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2, @@ -1568,7 +1866,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/algo.h gcc-7.1.0/libstdc } // Sequential fallback. -@@ -446,9 +446,9 @@ namespace __parallel +@@ -446,9 +446,9 @@ inline _OutputIterator set_intersection(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2, @@ -1580,7 +1878,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/algo.h gcc-7.1.0/libstdc // Sequential fallback. template > seqs; * for (int __i = 0; __i < 10; ++__i) * { seqs.push(std::make_pair(sequences[__i], -@@ -1733,7 +1733,7 @@ namespace __gnu_parallel +@@ -1733,7 +1733,7 @@ * for (int __j = 0; __i < 11; ++__j) * sequences[__i][__j] = __j; // __last one is sentinel! * @@ -1779,10 +2077,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/multiway_merge.h gcc-7.1 * std::vector > seqs; * for (int __i = 0; __i < 10; ++__i) * { seqs.push(std::make_pair(sequences[__i], -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-7.1.0/libstdc++-v3/include/parallel/set_operations.h ---- gcc-7.1.0-orig/libstdc++-v3/include/parallel/set_operations.h 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/parallel/set_operations.h 2017-06-23 19:59:50.516599900 -0400 -@@ -130,12 +130,12 @@ namespace __gnu_parallel +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-10.1.0/libstdc++-v3/include/parallel/set_operations.h +--- gcc-10.1.0-orig/libstdc++-v3/include/parallel/set_operations.h 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/parallel/set_operations.h 2020-05-08 15:27:15.083009600 +0300 +@@ -130,12 +130,12 @@ } _OutputIterator @@ -1799,7 +2097,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-7.1 }; -@@ -198,12 +198,12 @@ namespace __gnu_parallel +@@ -198,12 +198,12 @@ } _OutputIterator @@ -1816,7 +2114,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-7.1 }; -@@ -265,12 +265,12 @@ namespace __gnu_parallel +@@ -265,12 +265,12 @@ } _OutputIterator @@ -1833,7 +2131,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-7.1 }; template -@@ -335,12 +335,12 @@ namespace __gnu_parallel +@@ -335,12 +335,12 @@ } _OutputIterator @@ -1850,10 +2148,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/parallel/set_operations.h gcc-7.1 }; template + void + __parallel_merge(_ExecutionPolicy&&, _RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, +- _RandomAccessIterator2 __first2, _RandomAccessIterator2 __last2, _RandomAccessIterator3 __out, ++ _RandomAccessIterator2 __first2, _RandomAccessIterator2 __last2, _RandomAccessIterator3 ___out, + _Compare __comp, _LeafMerge __leaf_merge) + { +- __leaf_merge(__first1, __last1, __first2, __last2, __out, __comp); ++ __leaf_merge(__first1, __last1, __first2, __last2, ___out, __comp); + } + + template +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/std/istream gcc-10.1.0/libstdc++-v3/include/std/istream +--- gcc-10.1.0-orig/libstdc++-v3/include/std/istream 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/std/istream 2020-05-08 15:27:15.096048100 +0300 +@@ -738,7 +738,7 @@ //@{ /** * @brief Character extractors @@ -1892,7 +2206,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/istream gcc-7.1.0/libstdc++-v * @param __c A character reference. * @return in * -@@ -749,25 +749,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -749,25 +749,25 @@ */ template basic_istream<_CharT, _Traits>& @@ -1925,7 +2239,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/istream gcc-7.1.0/libstdc++-v * * Behaves like one of the formatted arithmetic extractors described in * std::basic_istream. After constructing a sentry object with good -@@ -791,22 +791,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -791,22 +791,22 @@ */ template basic_istream<_CharT, _Traits>& @@ -1954,10 +2268,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/istream gcc-7.1.0/libstdc++-v //@} /** -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/ostream gcc-7.1.0/libstdc++-v3/include/std/ostream ---- gcc-7.1.0-orig/libstdc++-v3/include/std/ostream 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/std/ostream 2017-06-23 19:59:50.551604300 -0400 -@@ -479,14 +479,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/std/ostream gcc-10.1.0/libstdc++-v3/include/std/ostream +--- gcc-10.1.0-orig/libstdc++-v3/include/std/ostream 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/std/ostream 2020-05-08 16:22:41.690280200 +0300 +@@ -488,14 +488,14 @@ //@{ /** * @brief Character inserters @@ -1974,7 +2288,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/ostream gcc-7.1.0/libstdc++-v * called. * * If @p __c is of type @c char and the character type of the stream is not -@@ -494,36 +494,36 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -503,30 +503,30 @@ */ template inline basic_ostream<_CharT, _Traits>& @@ -1991,7 +2305,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/ostream gcc-7.1.0/libstdc++-v + { return (___out << ___out.widen(__c)); } // Specialization - template + template inline basic_ostream& - operator<<(basic_ostream& __out, char __c) - { return __ostream_insert(__out, &__c, 1); } @@ -1999,21 +2313,23 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/ostream gcc-7.1.0/libstdc++-v + { return __ostream_insert(___out, &__c, 1); } // Signed and unsigned - template + template inline basic_ostream& - operator<<(basic_ostream& __out, signed char __c) - { return (__out << static_cast(__c)); } + operator<<(basic_ostream& ___out, signed char __c) + { return (___out << static_cast(__c)); } - template + template inline basic_ostream& - operator<<(basic_ostream& __out, unsigned char __c) - { return (__out << static_cast(__c)); } + operator<<(basic_ostream& ___out, unsigned char __c) + { return (___out << static_cast(__c)); } - //@} + #if __cplusplus > 201703L + // The following deleted overloads prevent formatting character values as +@@ -573,7 +573,7 @@ //@{ /** * @brief String inserters @@ -2022,7 +2338,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/ostream gcc-7.1.0/libstdc++-v * @param __s A character string. * @return out * @pre @p __s must be a non-NULL pointer -@@ -532,47 +532,47 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -582,47 +582,47 @@ * 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 @@ -2051,7 +2367,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/ostream gcc-7.1.0/libstdc++-v + operator<<(basic_ostream<_CharT, _Traits>& ___out, const char* __s); // Partial specializations - template + template inline basic_ostream& - operator<<(basic_ostream& __out, const char* __s) + operator<<(basic_ostream& ___out, const char* __s) @@ -2068,35 +2384,35 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/ostream gcc-7.1.0/libstdc++-v } // Signed and unsigned - template + template inline basic_ostream& - operator<<(basic_ostream& __out, const signed char* __s) - { return (__out << reinterpret_cast(__s)); } + operator<<(basic_ostream& ___out, const signed char* __s) + { return (___out << reinterpret_cast(__s)); } - template + template inline basic_ostream & - operator<<(basic_ostream& __out, const unsigned char* __s) - { return (__out << reinterpret_cast(__s)); } + operator<<(basic_ostream& ___out, const unsigned char* __s) + { return (___out << reinterpret_cast(__s)); } - //@} - // Standard basic_ostream manipulators -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/thread gcc-7.1.0/libstdc++-v3/include/std/thread ---- gcc-7.1.0-orig/libstdc++-v3/include/std/thread 2017-01-03 08:31:26.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/std/thread 2017-06-23 19:59:50.561605600 -0400 -@@ -96,7 +96,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + #if __cplusplus > 201703L + // The following deleted overloads prevent formatting strings as +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/std/thread gcc-10.1.0/libstdc++-v3/include/std/thread +--- gcc-10.1.0-orig/libstdc++-v3/include/std/thread 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/std/thread 2020-05-08 16:26:35.600707900 +0300 +@@ -112,7 +112,7 @@ template friend basic_ostream<_CharT, _Traits>& -- operator<<(basic_ostream<_CharT, _Traits>& __out, thread::id __id); -+ operator<<(basic_ostream<_CharT, _Traits>& ___out, thread::id __id); +- operator<<(basic_ostream<_CharT, _Traits>& __out, id __id); ++ operator<<(basic_ostream<_CharT, _Traits>& ___out, id __id); }; private: -@@ -313,12 +313,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -345,12 +345,12 @@ template inline basic_ostream<_CharT, _Traits>& @@ -2111,11 +2427,11 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/thread gcc-7.1.0/libstdc++-v3 + return ___out << __id._M_thread; } - _GLIBCXX_END_NAMESPACE_VERSION -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/include/std/tuple ---- gcc-7.1.0-orig/libstdc++-v3/include/std/tuple 2017-03-23 15:40:07.000000000 -0400 -+++ gcc-7.1.0/libstdc++-v3/include/std/tuple 2017-06-23 19:59:50.576607700 -0400 -@@ -224,23 +224,23 @@ + /** @namespace std::this_thread +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/std/tuple gcc-10.1.0/libstdc++-v3/include/std/tuple +--- gcc-10.1.0-orig/libstdc++-v3/include/std/tuple 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/std/tuple 2020-05-08 16:34:58.013623400 +0300 +@@ -230,23 +230,23 @@ _Tuple_impl& operator=(const _Tuple_impl&) = delete; constexpr @@ -2147,10 +2463,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + (_Tuple_impl<_Idx, _UHead, _UTails...>::_M_head(___in))) { } template - _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a) -@@ -264,60 +264,60 @@ - + _GLIBCXX20_CONSTEXPR +@@ -273,66 +273,66 @@ template + _GLIBCXX20_CONSTEXPR _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a, - const _Tuple_impl& __in) - : _Inherited(__tag, __a, _M_tail(__in)), @@ -2160,6 +2476,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + _Base(__use_alloc<_Head, _Alloc, _Head>(__a), _M_head(___in)) { } template + _GLIBCXX20_CONSTEXPR _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a, - _Tuple_impl&& __in) - : _Inherited(__tag, __a, std::move(_M_tail(__in))), @@ -2170,6 +2487,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + std::forward<_Head>(_M_head(___in))) { } template + _GLIBCXX20_CONSTEXPR _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a, - const _Tuple_impl<_Idx, _UElements...>& __in) + const _Tuple_impl<_Idx, _UElements...>& ___in) @@ -2181,6 +2499,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + _Tuple_impl<_Idx, _UElements...>::_M_head(___in)) { } template + _GLIBCXX20_CONSTEXPR _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a, - _Tuple_impl<_Idx, _UHead, _UTails...>&& __in) + _Tuple_impl<_Idx, _UHead, _UTails...>&& ___in) @@ -2193,6 +2512,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + (_Tuple_impl<_Idx, _UHead, _UTails...>::_M_head(___in))) { } template + _GLIBCXX20_CONSTEXPR void - _M_assign(const _Tuple_impl<_Idx, _UElements...>& __in) + _M_assign(const _Tuple_impl<_Idx, _UElements...>& ___in) @@ -2205,6 +2525,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } template + _GLIBCXX20_CONSTEXPR void - _M_assign(_Tuple_impl<_Idx, _UHead, _UTails...>&& __in) + _M_assign(_Tuple_impl<_Idx, _UHead, _UTails...>&& ___in) @@ -2218,6 +2539,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } protected: + _GLIBCXX20_CONSTEXPR void - _M_swap(_Tuple_impl& __in) + _M_swap(_Tuple_impl& ___in) @@ -2230,7 +2552,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } }; -@@ -355,17 +355,17 @@ +@@ -370,17 +370,17 @@ _Tuple_impl& operator=(const _Tuple_impl&) = delete; constexpr @@ -2254,9 +2576,9 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ { } template -@@ -385,49 +385,49 @@ - +@@ -403,55 +403,55 @@ template + _GLIBCXX20_CONSTEXPR _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a, - const _Tuple_impl& __in) - : _Base(__use_alloc<_Head, _Alloc, _Head>(__a), _M_head(__in)) { } @@ -2264,6 +2586,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + : _Base(__use_alloc<_Head, _Alloc, _Head>(__a), _M_head(___in)) { } template + _GLIBCXX20_CONSTEXPR _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a, - _Tuple_impl&& __in) + _Tuple_impl&& ___in) @@ -2272,6 +2595,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + std::forward<_Head>(_M_head(___in))) { } template + _GLIBCXX20_CONSTEXPR _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a, - const _Tuple_impl<_Idx, _UHead>& __in) + const _Tuple_impl<_Idx, _UHead>& ___in) @@ -2280,6 +2604,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + _Tuple_impl<_Idx, _UHead>::_M_head(___in)) { } template + _GLIBCXX20_CONSTEXPR _Tuple_impl(allocator_arg_t __tag, const _Alloc& __a, - _Tuple_impl<_Idx, _UHead>&& __in) + _Tuple_impl<_Idx, _UHead>&& ___in) @@ -2289,6 +2614,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ { } template + _GLIBCXX20_CONSTEXPR void - _M_assign(const _Tuple_impl<_Idx, _UHead>& __in) + _M_assign(const _Tuple_impl<_Idx, _UHead>& ___in) @@ -2298,6 +2624,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } template + _GLIBCXX20_CONSTEXPR void - _M_assign(_Tuple_impl<_Idx, _UHead>&& __in) + _M_assign(_Tuple_impl<_Idx, _UHead>&& ___in) @@ -2308,6 +2635,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } protected: + _GLIBCXX20_CONSTEXPR void - _M_swap(_Tuple_impl& __in) + _M_swap(_Tuple_impl& ___in) @@ -2318,70 +2646,74 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } }; -@@ -655,8 +655,8 @@ - && _TNTC<_Dummy>::template - _NonNestedTuple&>(), - bool>::type=true> -- constexpr tuple(const tuple<_UElements...>& __in) -- : _Inherited(static_cast&>(__in)) -+ constexpr tuple(const tuple<_UElements...>& ___in) -+ : _Inherited(static_cast&>(___in)) - { } +@@ -667,9 +667,9 @@ + && !__use_other_ctor&>(), + _ImplicitCtor<_Valid, const _UElements&...> = true> + constexpr +- tuple(const tuple<_UElements...>& __in) ++ tuple(const tuple<_UElements...>& ___in) + noexcept(__nothrow_constructible()) +- : _Inherited(static_cast&>(__in)) ++ : _Inherited(static_cast&>(___in)) + { } - template::template - _NonNestedTuple&>(), - bool>::type=false> -- explicit constexpr tuple(const tuple<_UElements...>& __in) -- : _Inherited(static_cast&>(__in)) -+ explicit constexpr tuple(const tuple<_UElements...>& ___in) -+ : _Inherited(static_cast&>(___in)) - { } + template&>(), + _ExplicitCtor<_Valid, const _UElements&...> = false> + explicit constexpr +- tuple(const tuple<_UElements...>& __in) ++ tuple(const tuple<_UElements...>& ___in) + noexcept(__nothrow_constructible()) +- : _Inherited(static_cast&>(__in)) ++ : _Inherited(static_cast&>(___in)) + { } - template::template - _NonNestedTuple&&>(), - bool>::type=true> -- constexpr tuple(tuple<_UElements...>&& __in) -- : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { } -+ constexpr tuple(tuple<_UElements...>&& ___in) -+ : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(___in)) { } + template&&>(), + _ImplicitCtor<_Valid, _UElements...> = true> + constexpr +- tuple(tuple<_UElements...>&& __in) ++ tuple(tuple<_UElements...>&& ___in) + noexcept(__nothrow_constructible<_UElements...>()) +- : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { } ++ : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(___in)) { } - template::template -@@ -690,8 +690,8 @@ - && _TNTC<_Dummy>::template - _NonNestedTuple&&>(), - bool>::type=false> -- explicit constexpr tuple(tuple<_UElements...>&& __in) -- : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { } -+ explicit constexpr tuple(tuple<_UElements...>&& ___in) -+ : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(___in)) { } + template&&>(), + _ExplicitCtor<_Valid, _UElements...> = false> + explicit constexpr +- tuple(tuple<_UElements...>&& __in) ++ tuple(tuple<_UElements...>&& ___in) + noexcept(__nothrow_constructible<_UElements...>()) +- : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { } ++ : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(___in)) { } // Allocator-extended constructors. -@@ -744,12 +744,12 @@ - { } +@@ -744,13 +744,13 @@ template + _GLIBCXX20_CONSTEXPR - tuple(allocator_arg_t __tag, const _Alloc& __a, const tuple& __in) - : _Inherited(__tag, __a, static_cast(__in)) { } + tuple(allocator_arg_t __tag, const _Alloc& __a, const tuple& ___in) + : _Inherited(__tag, __a, static_cast(___in)) { } template + _GLIBCXX20_CONSTEXPR - tuple(allocator_arg_t __tag, const _Alloc& __a, tuple&& __in) - : _Inherited(__tag, __a, static_cast<_Inherited&&>(__in)) { } + tuple(allocator_arg_t __tag, const _Alloc& __a, tuple&& ___in) + : _Inherited(__tag, __a, static_cast<_Inherited&&>(___in)) { } - template&&>(), - bool>::type=true> + template = true> + _GLIBCXX20_CONSTEXPR tuple(allocator_arg_t __tag, const _Alloc& __a, - const tuple<_UElements...>& __in) + const tuple<_UElements...>& ___in) @@ -2390,11 +2722,11 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + static_cast&>(___in)) { } - template&&>(), - bool>::type=false> - explicit tuple(allocator_arg_t __tag, const _Alloc& __a, + template& __in) + const tuple<_UElements...>& ___in) : _Inherited(__tag, __a, @@ -2402,10 +2734,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + static_cast&>(___in)) { } - template&&>(), - bool>::type=true> + template = true> + _GLIBCXX20_CONSTEXPR tuple(allocator_arg_t __tag, const _Alloc& __a, - tuple<_UElements...>&& __in) + tuple<_UElements...>&& ___in) @@ -2414,11 +2746,11 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + static_cast<_Tuple_impl<0, _UElements...>&&>(___in)) { } - template&&>(), - bool>::type=false> - explicit tuple(allocator_arg_t __tag, const _Alloc& __a, + template&& __in) + tuple<_UElements...>&& ___in) : _Inherited(__tag, __a, @@ -2427,12 +2759,12 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ { } // tuple assignment -@@ -816,46 +816,46 @@ +@@ -804,10 +804,10 @@ tuple& operator=(typename conditional<__assignable(), const tuple&, -- const __nonesuch_no_braces&>::type __in) -+ const __nonesuch_no_braces&>::type ___in) +- const __nonesuch&>::type __in) ++ const __nonesuch&>::type ___in) noexcept(__nothrow_assignable()) { - this->_M_assign(__in); @@ -2440,11 +2772,12 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ return *this; } +@@ -815,39 +815,39 @@ tuple& operator=(typename conditional<__assignable<_Elements...>(), tuple&&, -- __nonesuch_no_braces&&>::type __in) -+ __nonesuch_no_braces&&>::type ___in) +- __nonesuch&&>::type __in) ++ __nonesuch&&>::type ___in) noexcept(__nothrow_assignable<_Elements...>()) { - this->_M_assign(std::move(__in)); @@ -2453,6 +2786,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } template + _GLIBCXX20_CONSTEXPR __enable_if_t<__assignable(), tuple&> - operator=(const tuple<_UElements...>& __in) + operator=(const tuple<_UElements...>& ___in) @@ -2464,6 +2798,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } template + _GLIBCXX20_CONSTEXPR __enable_if_t<__assignable<_UElements...>(), tuple&> - operator=(tuple<_UElements...>&& __in) + operator=(tuple<_UElements...>&& ___in) @@ -2475,6 +2810,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } // tuple swap + _GLIBCXX20_CONSTEXPR void - swap(tuple& __in) + swap(tuple& ___in) @@ -2484,118 +2820,104 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ }; #if __cpp_deduction_guides >= 201606 -@@ -988,8 +988,8 @@ - && _TMC::template - _ImplicitlyConvertibleTuple<_U1, _U2>(), - bool>::type = true> -- constexpr tuple(const tuple<_U1, _U2>& __in) +@@ -998,60 +998,60 @@ + template = true> + constexpr +- tuple(const tuple<_U1, _U2>& __in) ++ tuple(const tuple<_U1, _U2>& ___in) + noexcept(__nothrow_constructible()) - : _Inherited(static_cast&>(__in)) { } -+ constexpr tuple(const tuple<_U1, _U2>& ___in) + : _Inherited(static_cast&>(___in)) { } - template(), - bool>::type = false> -- explicit constexpr tuple(const tuple<_U1, _U2>& __in) + template = false> + explicit constexpr +- tuple(const tuple<_U1, _U2>& __in) ++ tuple(const tuple<_U1, _U2>& ___in) + noexcept(__nothrow_constructible()) - : _Inherited(static_cast&>(__in)) { } -+ explicit constexpr tuple(const tuple<_U1, _U2>& ___in) + : _Inherited(static_cast&>(___in)) { } - template(), - bool>::type = true> -- constexpr tuple(tuple<_U1, _U2>&& __in) + template = true> + constexpr +- tuple(tuple<_U1, _U2>&& __in) ++ tuple(tuple<_U1, _U2>&& ___in) + noexcept(__nothrow_constructible<_U1, _U2>()) - : _Inherited(static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in)) { } -+ constexpr tuple(tuple<_U1, _U2>&& ___in) + : _Inherited(static_cast<_Tuple_impl<0, _U1, _U2>&&>(___in)) { } - template(), - bool>::type = false> -- explicit constexpr tuple(tuple<_U1, _U2>&& __in) + template = false> + explicit constexpr +- tuple(tuple<_U1, _U2>&& __in) ++ tuple(tuple<_U1, _U2>&& ___in) + noexcept(__nothrow_constructible<_U1, _U2>()) - : _Inherited(static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in)) { } -+ explicit constexpr tuple(tuple<_U1, _U2>&& ___in) + : _Inherited(static_cast<_Tuple_impl<0, _U1, _U2>&&>(___in)) { } - template(), - bool>::type = true> -- constexpr tuple(const pair<_U1, _U2>& __in) + template = true> + constexpr +- tuple(const pair<_U1, _U2>& __in) ++ tuple(const pair<_U1, _U2>& ___in) + noexcept(__nothrow_constructible()) - : _Inherited(__in.first, __in.second) { } -+ constexpr tuple(const pair<_U1, _U2>& ___in) + : _Inherited(___in.first, ___in.second) { } - template(), - bool>::type = false> -- explicit constexpr tuple(const pair<_U1, _U2>& __in) + template = false> + explicit constexpr +- tuple(const pair<_U1, _U2>& __in) ++ tuple(const pair<_U1, _U2>& ___in) + noexcept(__nothrow_constructible()) - : _Inherited(__in.first, __in.second) { } -+ explicit constexpr tuple(const pair<_U1, _U2>& ___in) + : _Inherited(___in.first, ___in.second) { } - template(), - bool>::type = true> -- constexpr tuple(pair<_U1, _U2>&& __in) + template = true> + constexpr +- tuple(pair<_U1, _U2>&& __in) ++ tuple(pair<_U1, _U2>&& ___in) + noexcept(__nothrow_constructible<_U1, _U2>()) - : _Inherited(std::forward<_U1>(__in.first), - std::forward<_U2>(__in.second)) { } -+ constexpr tuple(pair<_U1, _U2>&& ___in) + : _Inherited(std::forward<_U1>(___in.first), + std::forward<_U2>(___in.second)) { } - template(), - bool>::type = false> -- explicit constexpr tuple(pair<_U1, _U2>&& __in) + template = false> + explicit constexpr +- tuple(pair<_U1, _U2>&& __in) ++ tuple(pair<_U1, _U2>&& ___in) + noexcept(__nothrow_constructible<_U1, _U2>()) - : _Inherited(std::forward<_U1>(__in.first), - std::forward<_U2>(__in.second)) { } -+ explicit constexpr tuple(pair<_U1, _U2>&& ___in) + : _Inherited(std::forward<_U1>(___in.first), + std::forward<_U2>(___in.second)) { } // Allocator-extended constructors. -@@ -1108,12 +1108,12 @@ - std::forward<_U2>(__a2)) { } +@@ -1094,21 +1094,21 @@ template + _GLIBCXX20_CONSTEXPR - tuple(allocator_arg_t __tag, const _Alloc& __a, const tuple& __in) - : _Inherited(__tag, __a, static_cast(__in)) { } + tuple(allocator_arg_t __tag, const _Alloc& __a, const tuple& ___in) + : _Inherited(__tag, __a, static_cast(___in)) { } template + _GLIBCXX20_CONSTEXPR - tuple(allocator_arg_t __tag, const _Alloc& __a, tuple&& __in) - : _Inherited(__tag, __a, static_cast<_Inherited&&>(__in)) { } + tuple(allocator_arg_t __tag, const _Alloc& __a, tuple&& ___in) + : _Inherited(__tag, __a, static_cast<_Inherited&&>(___in)) { } - template(), - bool>::type = true> + template = true> + _GLIBCXX20_CONSTEXPR tuple(allocator_arg_t __tag, const _Alloc& __a, - const tuple<_U1, _U2>& __in) + const tuple<_U1, _U2>& ___in) @@ -2604,11 +2926,11 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + static_cast&>(___in)) { } - template(), - bool>::type = false> - explicit tuple(allocator_arg_t __tag, const _Alloc& __a, + template& __in) + const tuple<_U1, _U2>& ___in) : _Inherited(__tag, __a, @@ -2616,80 +2938,73 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ + static_cast&>(___in)) { } - template(), - bool>::type = true> + template = true> + _GLIBCXX20_CONSTEXPR - tuple(allocator_arg_t __tag, const _Alloc& __a, tuple<_U1, _U2>&& __in) - : _Inherited(__tag, __a, static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in)) + tuple(allocator_arg_t __tag, const _Alloc& __a, tuple<_U1, _U2>&& ___in) + : _Inherited(__tag, __a, static_cast<_Tuple_impl<0, _U1, _U2>&&>(___in)) { } - template(), - bool>::type = false> - explicit tuple(allocator_arg_t __tag, const _Alloc& __a, -- tuple<_U1, _U2>&& __in) + template = false> + explicit + _GLIBCXX20_CONSTEXPR +- tuple(allocator_arg_t __tag, const _Alloc& __a, tuple<_U1, _U2>&& __in) - : _Inherited(__tag, __a, static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in)) -+ tuple<_U1, _U2>&& ___in) ++ tuple(allocator_arg_t __tag, const _Alloc& __a, tuple<_U1, _U2>&& ___in) + : _Inherited(__tag, __a, static_cast<_Tuple_impl<0, _U1, _U2>&&>(___in)) { } - template(), - bool>::type = true> - tuple(allocator_arg_t __tag, const _Alloc& __a, + template = true> + _GLIBCXX20_CONSTEXPR + tuple(allocator_arg_t __tag, const _Alloc& __a, - const pair<_U1, _U2>& __in) - : _Inherited(__tag, __a, __in.first, __in.second) { } + const pair<_U1, _U2>& ___in) + : _Inherited(__tag, __a, ___in.first, ___in.second) { } - template(), - bool>::type = false> - explicit tuple(allocator_arg_t __tag, const _Alloc& __a, + template = false> + explicit + _GLIBCXX20_CONSTEXPR + tuple(allocator_arg_t __tag, const _Alloc& __a, - const pair<_U1, _U2>& __in) - : _Inherited(__tag, __a, __in.first, __in.second) { } + const pair<_U1, _U2>& ___in) + : _Inherited(__tag, __a, ___in.first, ___in.second) { } - template(), - bool>::type = true> -- tuple(allocator_arg_t __tag, const _Alloc& __a, pair<_U1, _U2>&& __in) + template = true> + _GLIBCXX20_CONSTEXPR +- tuple(allocator_arg_t __tag, const _Alloc& __a, pair<_U1, _U2>&& __in) - : _Inherited(__tag, __a, std::forward<_U1>(__in.first), - std::forward<_U2>(__in.second)) { } -+ tuple(allocator_arg_t __tag, const _Alloc& __a, pair<_U1, _U2>&& ___in) ++ tuple(allocator_arg_t __tag, const _Alloc& __a, pair<_U1, _U2>&& ___in) + : _Inherited(__tag, __a, std::forward<_U1>(___in.first), + std::forward<_U2>(___in.second)) { } - template(), - bool>::type = false> - explicit tuple(allocator_arg_t __tag, const _Alloc& __a, -- pair<_U1, _U2>&& __in) + template = false> + explicit + _GLIBCXX20_CONSTEXPR +- tuple(allocator_arg_t __tag, const _Alloc& __a, pair<_U1, _U2>&& __in) - : _Inherited(__tag, __a, std::forward<_U1>(__in.first), - std::forward<_U2>(__in.second)) { } -+ pair<_U1, _U2>&& ___in) ++ tuple(allocator_arg_t __tag, const _Alloc& __a, pair<_U1, _U2>&& ___in) + : _Inherited(__tag, __a, std::forward<_U1>(___in.first), + std::forward<_U2>(___in.second)) { } + // Tuple assignment. + +@@ -1172,10 +1172,10 @@ tuple& operator=(typename conditional<__assignable(), const tuple&, -- const __nonesuch_no_braces&>::type __in) -+ const __nonesuch_no_braces&>::type ___in) +- const __nonesuch&>::type __in) ++ const __nonesuch&>::type ___in) noexcept(__nothrow_assignable()) { - this->_M_assign(__in); @@ -2697,11 +3012,12 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ return *this; } +@@ -1183,61 +1183,61 @@ tuple& operator=(typename conditional<__assignable<_T1, _T2>(), tuple&&, -- __nonesuch_no_braces&&>::type __in) -+ __nonesuch_no_braces&&>::type ___in) +- __nonesuch&&>::type __in) ++ __nonesuch&&>::type ___in) noexcept(__nothrow_assignable<_T1, _T2>()) { - this->_M_assign(std::move(__in)); @@ -2710,6 +3026,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } template + _GLIBCXX20_CONSTEXPR __enable_if_t<__assignable(), tuple&> - operator=(const tuple<_U1, _U2>& __in) + operator=(const tuple<_U1, _U2>& ___in) @@ -2721,6 +3038,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } template + _GLIBCXX20_CONSTEXPR __enable_if_t<__assignable<_U1, _U2>(), tuple&> - operator=(tuple<_U1, _U2>&& __in) + operator=(tuple<_U1, _U2>&& ___in) @@ -2732,6 +3050,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } template + _GLIBCXX20_CONSTEXPR __enable_if_t<__assignable(), tuple&> - operator=(const pair<_U1, _U2>& __in) + operator=(const pair<_U1, _U2>& ___in) @@ -2745,6 +3064,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ } template + _GLIBCXX20_CONSTEXPR __enable_if_t<__assignable<_U1, _U2>(), tuple&> - operator=(pair<_U1, _U2>&& __in) + operator=(pair<_U1, _U2>&& ___in) @@ -2757,6 +3077,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ return *this; } + _GLIBCXX20_CONSTEXPR void - swap(tuple& __in) + swap(tuple& ___in) @@ -2767,10 +3088,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/tuple gcc-7.1.0/libstdc++-v3/ }; -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/utility gcc-7.1.0/libstdc++-v3/include/std/utility ---- gcc-7.1.0-orig/libstdc++-v3/include/std/utility 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/std/utility 2017-06-23 19:59:50.586108900 -0400 -@@ -205,18 +205,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/std/utility gcc-10.1.0/libstdc++-v3/include/std/utility +--- gcc-10.1.0-orig/libstdc++-v3/include/std/utility 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/std/utility 2020-05-08 17:18:30.711365300 +0300 +@@ -220,23 +220,23 @@ template constexpr typename tuple_element<_Int, std::pair<_Tp1, _Tp2>>::type& @@ -2793,12 +3114,19 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/std/utility gcc-7.1.0/libstdc++-v + get(const std::pair<_Tp1, _Tp2>& ___in) noexcept + { return __pair_get<_Int>::__const_get(___in); } - #if __cplusplus > 201103L + template + constexpr const typename tuple_element<_Int, std::pair<_Tp1, _Tp2>>::type&& +- get(const std::pair<_Tp1, _Tp2>&& __in) noexcept +- { return __pair_get<_Int>::__const_move_get(std::move(__in)); } ++ get(const std::pair<_Tp1, _Tp2>&& ___in) noexcept ++ { return __pair_get<_Int>::__const_move_get(std::move(___in)); } -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr1/regex gcc-7.1.0/libstdc++-v3/include/tr1/regex ---- gcc-7.1.0-orig/libstdc++-v3/include/tr1/regex 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/tr1/regex 2017-06-23 19:59:50.604610900 -0400 -@@ -2008,7 +2008,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + #if __cplusplus >= 201402L + +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/tr1/regex gcc-10.1.0/libstdc++-v3/include/tr1/regex +--- gcc-10.1.0-orig/libstdc++-v3/include/tr1/regex 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/tr1/regex 2020-05-08 15:27:15.152848800 +0300 +@@ -2005,7 +2005,7 @@ */ template _Out_iter @@ -2807,7 +3135,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr1/regex gcc-7.1.0/libstdc++-v3/ regex_constants::match_flag_type __flags = regex_constants::format_default) const; -@@ -2404,7 +2404,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -2401,7 +2401,7 @@ template inline _Out_iter @@ -2816,10 +3144,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr1/regex gcc-7.1.0/libstdc++-v3/ const basic_regex<_Ch_type, _Rx_traits>& __e, const basic_string<_Ch_type>& __fmt, regex_constants::match_flag_type __flags -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr1/tuple gcc-7.1.0/libstdc++-v3/include/tr1/tuple ---- gcc-7.1.0-orig/libstdc++-v3/include/tr1/tuple 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/tr1/tuple 2017-06-23 19:59:50.615613100 -0400 -@@ -102,26 +102,26 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/tr1/tuple gcc-10.1.0/libstdc++-v3/include/tr1/tuple +--- gcc-10.1.0-orig/libstdc++-v3/include/tr1/tuple 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/tr1/tuple 2020-05-08 15:27:15.170772900 +0300 +@@ -102,26 +102,26 @@ : _Inherited(__tail...), _M_head(__head) { } template @@ -2856,7 +3184,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr1/tuple gcc-7.1.0/libstdc++-v3/ return *this; } }; -@@ -139,24 +139,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -139,24 +139,24 @@ : _Inherited(__elements...) { } template @@ -2889,7 +3217,7 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr1/tuple gcc-7.1.0/libstdc++-v3/ return *this; } }; -@@ -178,41 +178,41 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -178,41 +178,41 @@ : _Inherited(__a1, __a2) { } template @@ -2945,9 +3273,9 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr1/tuple gcc-7.1.0/libstdc++-v3/ return *this; } }; -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr1/utility gcc-7.1.0/libstdc++-v3/include/tr1/utility ---- gcc-7.1.0-orig/libstdc++-v3/include/tr1/utility 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/tr1/utility 2017-06-23 19:59:50.623613900 -0400 +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/tr1/utility gcc-10.1.0/libstdc++-v3/include/tr1/utility +--- gcc-10.1.0-orig/libstdc++-v3/include/tr1/utility 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/tr1/utility 2020-05-08 15:27:15.172801000 +0300 @@ -93,13 +93,13 @@ template @@ -2966,10 +3294,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr1/utility gcc-7.1.0/libstdc++-v } _GLIBCXX_END_NAMESPACE_VERSION -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr2/bool_set gcc-7.1.0/libstdc++-v3/include/tr2/bool_set ---- gcc-7.1.0-orig/libstdc++-v3/include/tr2/bool_set 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/tr2/bool_set 2017-06-23 19:59:50.632614700 -0400 -@@ -131,18 +131,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/tr2/bool_set gcc-10.1.0/libstdc++-v3/include/tr2/bool_set +--- gcc-10.1.0-orig/libstdc++-v3/include/tr2/bool_set 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/tr2/bool_set 2020-05-08 15:27:15.176798500 +0300 +@@ -131,18 +131,18 @@ template friend std::basic_ostream& @@ -2992,10 +3320,10 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr2/bool_set gcc-7.1.0/libstdc++- if (__c >= _S_false && __c < _S_empty) __b._M_b = static_cast<_Bool_set_val>(__c); } -diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr2/bool_set.tcc gcc-7.1.0/libstdc++-v3/include/tr2/bool_set.tcc ---- gcc-7.1.0-orig/libstdc++-v3/include/tr2/bool_set.tcc 2017-01-01 07:07:43.000000000 -0500 -+++ gcc-7.1.0/libstdc++-v3/include/tr2/bool_set.tcc 2017-06-23 19:59:50.641116000 -0400 -@@ -100,9 +100,9 @@ _GLIBCXX_END_NAMESPACE_VERSION +diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/tr2/bool_set.tcc gcc-10.1.0/libstdc++-v3/include/tr2/bool_set.tcc +--- gcc-10.1.0-orig/libstdc++-v3/include/tr2/bool_set.tcc 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/include/tr2/bool_set.tcc 2020-05-08 15:27:15.180745900 +0300 +@@ -100,9 +100,9 @@ * @param v Value to format and insert. * @return Iterator after reading. iter_type @@ -3007,3 +3335,316 @@ diff -aurp gcc-7.1.0-orig/libstdc++-v3/include/tr2/bool_set.tcc gcc-7.1.0/libstd */ /* template +diff -Naur gcc-10.1.0-orig/libstdc++-v3/scripts/gen_includers.pl gcc-10.1.0/libstdc++-v3/scripts/gen_includers.pl +--- gcc-10.1.0-orig/libstdc++-v3/scripts/gen_includers.pl 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/scripts/gen_includers.pl 2020-05-08 17:20:01.806557600 +0300 +@@ -15,8 +15,8 @@ + $bind_v_template_args = "typename result_of<_Mu<_T1> _CV(_T1, tuple<_GLIBCXX_BIND_TEMPLATE_ARGS>)>::type"; + $bind_v_args = "_Mu<_T1>()(_M_arg1, ::std::tr1::tie(_GLIBCXX_BIND_ARGS))"; + $tuple_add_cref = "typename __add_c_ref<_T1>::type __a1"; +-$tuple_copy_init = "_M_arg1(__in._M_arg1)"; +-$tuple_assign = "_M_arg1 = __in._M_arg1;"; ++$tuple_copy_init = "_M_arg1(___in._M_arg1)"; ++$tuple_assign = "_M_arg1 = ___in._M_arg1;"; + $template_params_null_class = "typename _T1 = _NullClass"; + $template_args_stripped = "typename __strip_reference_wrapper<_T1>::__type"; + $template_params_u = "typename _U1"; +@@ -42,8 +42,8 @@ + $bind_v_template_args .= ", typename result_of<_Mu<_T$num_args> _CV(_T$num_args, tuple<_GLIBCXX_BIND_TEMPLATE_ARGS>)>::type"; + $bind_v_args .= ", _Mu<_T$num_args>()(_M_arg$num_args, ::std::tr1::tie(_GLIBCXX_BIND_ARGS))"; + $tuple_add_cref .= ", typename __add_c_ref<_T$num_args>::type __a$num_args"; +- $tuple_copy_init .= ", _M_arg$num_args(__in._M_arg$num_args)"; +- $tuple_assign .= " _M_arg$num_args = __in._M_arg$num_args;"; ++ $tuple_copy_init .= ", _M_arg$num_args(___in._M_arg$num_args)"; ++ $tuple_assign .= " _M_arg$num_args = ___in._M_arg$num_args;"; + $template_params_null_class .= ", typename _T$num_args = _NullClass"; + $template_args_stripped .= ", typename __strip_reference_wrapper<_T$num_args>::__type"; + $template_params_u .= ", typename _U$num_args"; +diff -Naur gcc-10.1.0-orig/libstdc++-v3/src/c++11/snprintf_lite.cc gcc-10.1.0/libstdc++-v3/src/c++11/snprintf_lite.cc +--- gcc-10.1.0-orig/libstdc++-v3/src/c++11/snprintf_lite.cc 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/src/c++11/snprintf_lite.cc 2020-05-08 17:31:40.727583100 +0300 +@@ -74,14 +74,14 @@ + // Long enough for decimal representation. + int __ilen = 3 * sizeof(__val); + char *__cs = static_cast(__builtin_alloca(__ilen)); +- char* __out = __cs + __ilen; ++ char* ___out = __cs + __ilen; + do + { +- *--__out = "0123456789"[__val % 10]; ++ *--___out = "0123456789"[__val % 10]; + __val /= 10; + } + while (__val != 0); +- size_t __len = __cs + __ilen - __out; ++ size_t __len = __cs + __ilen - ___out; + if (__bufsize < __len) + return -1; + +diff -Naur gcc-10.1.0-orig/libstdc++-v3/src/c++98/istream.cc gcc-10.1.0/libstdc++-v3/src/c++98/istream.cc +--- gcc-10.1.0-orig/libstdc++-v3/src/c++98/istream.cc 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/src/c++98/istream.cc 2020-05-08 17:23:04.885820200 +0300 +@@ -194,7 +194,7 @@ + + template<> + basic_istream& +- operator>>(basic_istream& __in, char* __s) ++ operator>>(basic_istream& ___in, char* __s) + { + typedef basic_istream __istream_type; + typedef __istream_type::int_type __int_type; +@@ -205,20 +205,20 @@ + + streamsize __extracted = 0; + ios_base::iostate __err = ios_base::goodbit; +- __istream_type::sentry __cerb(__in, false); ++ __istream_type::sentry __cerb(___in, false); + if (__cerb) + { + __try + { + // Figure out how many characters to extract. +- streamsize __num = __in.width(); ++ streamsize __num = ___in.width(); + if (__num <= 0) + __num = __gnu_cxx::__numeric_traits::__max; + +- const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc()); ++ const __ctype_type& __ct = use_facet<__ctype_type>(___in.getloc()); + + const __int_type __eof = __traits_type::eof(); +- __streambuf_type* __sb = __in.rdbuf(); ++ __streambuf_type* __sb = ___in.rdbuf(); + __int_type __c = __sb->sgetc(); + + while (__extracted < __num - 1 +@@ -256,21 +256,21 @@ + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 68. Extractors for char* should store null at end + *__s = __char_type(); +- __in.width(0); ++ ___in.width(0); + } + __catch(__cxxabiv1::__forced_unwind&) + { +- __in._M_setstate(ios_base::badbit); ++ ___in._M_setstate(ios_base::badbit); + __throw_exception_again; + } + __catch(...) +- { __in._M_setstate(ios_base::badbit); } ++ { ___in._M_setstate(ios_base::badbit); } + } + if (!__extracted) + __err |= ios_base::failbit; + if (__err) +- __in.setstate(__err); +- return __in; ++ ___in.setstate(__err); ++ return ___in; + } + + #ifdef _GLIBCXX_USE_WCHAR_T +diff -Naur gcc-10.1.0-orig/libstdc++-v3/src/c++98/istream-string.cc gcc-10.1.0/libstdc++-v3/src/c++98/istream-string.cc +--- gcc-10.1.0-orig/libstdc++-v3/src/c++98/istream-string.cc 2020-05-07 13:50:02.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/src/c++98/istream-string.cc 2020-05-08 17:22:00.781026800 +0300 +@@ -40,7 +40,7 @@ + + template<> + basic_istream& +- operator>>(basic_istream& __in, basic_string& __str) ++ operator>>(basic_istream& ___in, basic_string& __str) + { + typedef basic_istream __istream_type; + typedef __istream_type::int_type __int_type; +@@ -52,18 +52,18 @@ + + __size_type __extracted = 0; + ios_base::iostate __err = ios_base::goodbit; +- __istream_type::sentry __cerb(__in, false); ++ __istream_type::sentry __cerb(___in, false); + if (__cerb) + { + __try + { + __str.erase(); +- const streamsize __w = __in.width(); ++ const streamsize __w = ___in.width(); + const __size_type __n = __w > 0 ? static_cast<__size_type>(__w) + : __str.max_size(); +- const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc()); ++ const __ctype_type& __ct = use_facet<__ctype_type>(___in.getloc()); + const __int_type __eof = __traits_type::eof(); +- __streambuf_type* __sb = __in.rdbuf(); ++ __streambuf_type* __sb = ___in.rdbuf(); + __int_type __c = __sb->sgetc(); + + while (__extracted < __n +@@ -95,11 +95,11 @@ + + if (__traits_type::eq_int_type(__c, __eof)) + __err |= ios_base::eofbit; +- __in.width(0); ++ ___in.width(0); + } + __catch(__cxxabiv1::__forced_unwind&) + { +- __in._M_setstate(ios_base::badbit); ++ ___in._M_setstate(ios_base::badbit); + __throw_exception_again; + } + __catch(...) +@@ -107,19 +107,19 @@ + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 91. Description of operator>> and getline() for string<> + // might cause endless loop +- __in._M_setstate(ios_base::badbit); ++ ___in._M_setstate(ios_base::badbit); + } + } + if (!__extracted) + __err |= ios_base::failbit; + if (__err) +- __in.setstate(__err); +- return __in; ++ ___in.setstate(__err); ++ return ___in; + } + + template<> + basic_istream& +- getline(basic_istream& __in, basic_string& __str, ++ getline(basic_istream& ___in, basic_string& __str, + char __delim) + { + typedef basic_istream __istream_type; +@@ -133,7 +133,7 @@ + __size_type __extracted = 0; + const __size_type __n = __str.max_size(); + ios_base::iostate __err = ios_base::goodbit; +- __istream_type::sentry __cerb(__in, true); ++ __istream_type::sentry __cerb(___in, true); + if (__cerb) + { + __try +@@ -141,7 +141,7 @@ + __str.erase(); + const __int_type __idelim = __traits_type::to_int_type(__delim); + const __int_type __eof = __traits_type::eof(); +- __streambuf_type* __sb = __in.rdbuf(); ++ __streambuf_type* __sb = ___in.rdbuf(); + __int_type __c = __sb->sgetc(); + + while (__extracted < __n +@@ -183,7 +183,7 @@ + } + __catch(__cxxabiv1::__forced_unwind&) + { +- __in._M_setstate(ios_base::badbit); ++ ___in._M_setstate(ios_base::badbit); + __throw_exception_again; + } + __catch(...) +@@ -191,20 +191,20 @@ + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 91. Description of operator>> and getline() for string<> + // might cause endless loop +- __in._M_setstate(ios_base::badbit); ++ ___in._M_setstate(ios_base::badbit); + } + } + if (!__extracted) + __err |= ios_base::failbit; + if (__err) +- __in.setstate(__err); +- return __in; ++ ___in.setstate(__err); ++ return ___in; + } + + #ifdef _GLIBCXX_USE_WCHAR_T + template<> + basic_istream& +- getline(basic_istream& __in, basic_string& __str, ++ getline(basic_istream& ___in, basic_string& __str, + wchar_t __delim) + { + typedef basic_istream __istream_type; +@@ -218,7 +218,7 @@ + __size_type __extracted = 0; + const __size_type __n = __str.max_size(); + ios_base::iostate __err = ios_base::goodbit; +- __istream_type::sentry __cerb(__in, true); ++ __istream_type::sentry __cerb(___in, true); + if (__cerb) + { + __try +@@ -226,7 +226,7 @@ + __str.erase(); + const __int_type __idelim = __traits_type::to_int_type(__delim); + const __int_type __eof = __traits_type::eof(); +- __streambuf_type* __sb = __in.rdbuf(); ++ __streambuf_type* __sb = ___in.rdbuf(); + __int_type __c = __sb->sgetc(); + + while (__extracted < __n +@@ -268,7 +268,7 @@ + } + __catch(__cxxabiv1::__forced_unwind&) + { +- __in._M_setstate(ios_base::badbit); ++ ___in._M_setstate(ios_base::badbit); + __throw_exception_again; + } + __catch(...) +@@ -276,14 +276,14 @@ + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 91. Description of operator>> and getline() for string<> + // might cause endless loop +- __in._M_setstate(ios_base::badbit); ++ ___in._M_setstate(ios_base::badbit); + } + } + if (!__extracted) + __err |= ios_base::failbit; + if (__err) +- __in.setstate(__err); +- return __in; ++ ___in.setstate(__err); ++ return ___in; + } + #endif + +diff -Naur gcc-10.1.0-orig/libstdc++-v3/testsuite/performance/27_io/ifstream_extract_chars.cc gcc-10.1.0/libstdc++-v3/testsuite/performance/27_io/ifstream_extract_chars.cc +--- gcc-10.1.0-orig/libstdc++-v3/testsuite/performance/27_io/ifstream_extract_chars.cc 2020-05-07 13:50:03.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/testsuite/performance/27_io/ifstream_extract_chars.cc 2020-05-08 17:24:18.822634600 +0300 +@@ -47,7 +47,7 @@ + out << line; + } + +- // operator>>(basic_istream& __in, basic_string& __str) ++ // operator>>(basic_istream& ___in, basic_string& __str) + { + start_counters(time, resource); + for (int iter = 0; iter < 25; ++iter) +@@ -62,7 +62,7 @@ + clear_counters(time, resource); + } + +- // operator>>(basic_istream& __in, char* __s) ++ // operator>>(basic_istream& ___in, char* __s) + { + start_counters(time, resource); + for (int iter = 0; iter < 25; ++iter) +diff -Naur gcc-10.1.0-orig/libstdc++-v3/testsuite/performance/27_io/ifstream_getline-2.cc gcc-10.1.0/libstdc++-v3/testsuite/performance/27_io/ifstream_getline-2.cc +--- gcc-10.1.0-orig/libstdc++-v3/testsuite/performance/27_io/ifstream_getline-2.cc 2020-05-07 13:50:03.000000000 +0300 ++++ gcc-10.1.0/libstdc++-v3/testsuite/performance/27_io/ifstream_getline-2.cc 2020-05-08 17:24:27.481493000 +0300 +@@ -63,7 +63,7 @@ + clear_counters(time, resource); + } + +- // getline(basic_istream<_CharT, _Traits>& __in, ++ // getline(basic_istream<_CharT, _Traits>& ___in, + // basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim) + { + ifstream file(filename); diff --git a/mingw-w64-gcc/0140-gcc-8.2.0-diagnostic-color.patch b/mingw-w64-gcc/0140-gcc-8.2.0-diagnostic-color.patch index c391802c41..77f7961d46 100644 --- a/mingw-w64-gcc/0140-gcc-8.2.0-diagnostic-color.patch +++ b/mingw-w64-gcc/0140-gcc-8.2.0-diagnostic-color.patch @@ -1,6 +1,6 @@ --- a/gcc/diagnostic-color.c 2018-01-03 16:03:58.000000000 +0600 +++ b/gcc/diagnostic-color.c 2018-08-02 16:33:22.679146900 +0600 -@@ -22,6 +22,7 @@ +@@ -23,6 +23,7 @@ #ifdef __MINGW32__ # include @@ -8,7 +8,7 @@ #endif #include "color-macros.h" -@@ -208,10 +209,42 @@ +@@ -210,10 +211,42 @@ to care about it either... */ HANDLE h; DWORD m; diff --git a/mingw-w64-gcc/PKGBUILD b/mingw-w64-gcc/PKGBUILD index 55891fbbf7..b767a062b2 100644 --- a/mingw-w64-gcc/PKGBUILD +++ b/mingw-w64-gcc/PKGBUILD @@ -17,11 +17,11 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" $([[ "$_enable_objc" == "yes" ]] && echo "${MINGW_PACKAGE_PREFIX}-${_realname}-objc") ) #_snapshot=20181214 -pkgver=9.3.0 +pkgver=10.1.0 #_majorver=${pkgver:0:1} #_sourcedir=${_realname}-${_majorver}-${_snapshot} _sourcedir=${_realname}-${pkgver} -pkgrel=2 +pkgrel=1 pkgdesc="GCC for the MinGW-w64" arch=('any') url="https://gcc.gnu.org" @@ -39,7 +39,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-mpfr" "${MINGW_PACKAGE_PREFIX}-windows-default-manifest" "${MINGW_PACKAGE_PREFIX}-winpthreads" - "${MINGW_PACKAGE_PREFIX}-zlib") + "${MINGW_PACKAGE_PREFIX}-zlib" + "${MINGW_PACKAGE_PREFIX}-zstd") #checkdepends=('dejagnu') optdepends=() options=('staticlibs' '!emptydirs') # '!strip' 'debug') @@ -58,25 +59,27 @@ source=("https://ftp.gnu.org/gnu/gcc/${_realname}-${pkgver%%+*}/${_realname}-${p 0011-Enable-shared-gnat-implib.patch 0012-Handle-spaces-in-path-for-default-manifest.patch 0014-gcc-9-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch + 0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch 0130-libstdc++-in-out.patch 0140-gcc-8.2.0-diagnostic-color.patch) -sha256sums=('71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1' +sha256sums=('b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2' 'SKIP' 'bce81824fc89e5e62cca350de4c17a27e27a18a1a1ad5ca3492aec1fc5af3234' - '2dd7498bcb25b41afcc458696386b456ee4ff440bf395519a23d1f945ba15a41' - '6033acda690786397059536787a6577e1a9f2b39f8a66276821917066094f43c' + '1247e81571c908548b4d9aaa3df1ad8fd73aad7b81e7eafea12d53bbada70e94' + '5b8ab5a54ebdd10c9802ea431b935ff4ba225eec6ca92824cfddfcf2ee8ac910' '388f423a67e4be6f547ca7e340ff8ee4c78b1ed83f3fd698daa409e309911807' - '86fc77d5a6c137a9aca65ad6ba56653fb41b05636b763ce2c0b0b14d617c9de4' - 'd1e10cd2ef5594c34acead334bb93af500e00699ba673edc8916da22a572677d' + 'bd1c201febdf292570b0da9dcc066a237916ab3166dce3610487814f131517e5' + '7f5fc74961ec0face6c4c56d3fc3613c38c5133bb68648191065bbf597f3e906' '3629446c0039d9061cfedcb6d7a7589279588bb4601c7ce233546d357bd4be34' - 'ec6800816632234afc35ce40542a6aab3ee76e8514a7d0cb4171fd874353ecd7' - '0eaee0e1201f4f85ea20756432a9d51531e0e859f6f121276684e2b63b2ee315' - '0decbbebda7ceac91da5d3dec9b7330f406a4358fa150560f08ff6f54739035f' - '8faff8e503a617f283270f411399a8bcacda3ab62b4072dedf117e108af4844a' - 'e427297a118c47d2e71cb05dd9a496e9ada497917721c16918548ee2f13ad709' - '2321c7dce29a600477e481d16d847f05dc8c6d6461ee1eba7814c5bf62c2ef95' - 'a526cfab91a1499be92c824c7f2185a013a38dbdfbeabe63ecbe84451e07b021' - 'e467f0ac68b349de826c79b00a45c5ad9e7c5a55d06b9b9fa7afd94c597f6376') + '2e4f7d0ef739aec8986eb06a2baadee552ebc2e8be661c39a448e93515179eb5' + '513a824ee500d063f09ec920a9ad317a3a117e5468bf201aaf3f70dd0000e769' + 'ec58aafba0174313451c282339bbd67ed0b11bca034c29023e0138b61441cf71' + '3402f11c3edb3a2b0f27f7159c476879e1e6cddb05ac0327968d89ea245044c7' + '11dd5388a1e1c0a2bc8bc3824726598784b9b9e0896a3d77950ba6a4569f1128' + '21e31addcf13bc6fa6650b02ed0f2e195a1226260ae48c536840cc9230de2cfc' + '276ecc392c777d4b17d771a987e80dca50ff25d8f65671d5de139be73997064b' + '441d63d95622ffcc2fa5dd688aecad20d2ab16d7d275c567865a754e1d3d4b7a' + '5240a9e731b45c17a164066c7eb193c1fbee9fd8d9a2a5afa2edbcde9510da47') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -115,7 +118,8 @@ prepare() { 0010-Fix-using-large-PCH.patch \ 0011-Enable-shared-gnat-implib.patch \ 0012-Handle-spaces-in-path-for-default-manifest.patch \ - 0014-gcc-9-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch + 0014-gcc-9-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch \ + 0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch apply_patch_with_msg \ 0130-libstdc++-in-out.patch @@ -198,7 +202,7 @@ build() { --disable-nls \ --disable-werror \ --disable-symvers \ - --enable-plugin \ + --disable-plugin \ --with-libiconv \ --with-system-zlib \ --with-{gmp,mpfr,mpc,isl}=${MINGW_PREFIX} \ @@ -269,7 +273,8 @@ package_mingw-w64-gcc() { "${MINGW_PACKAGE_PREFIX}-${_realname}-libs=${pkgver}-${pkgrel}" "${MINGW_PACKAGE_PREFIX}-windows-default-manifest" "${MINGW_PACKAGE_PREFIX}-winpthreads" - "${MINGW_PACKAGE_PREFIX}-zlib") + "${MINGW_PACKAGE_PREFIX}-zlib" + "${MINGW_PACKAGE_PREFIX}-zstd") provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-base") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-base") @@ -300,7 +305,7 @@ package_mingw-w64-gcc() { cp -r lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/include/ssp ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/include/ cp -r lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/include-fixed ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/ cp -r lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/install-tools ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/ - cp -r lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/plugin ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/ + #cp -r lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/plugin ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/ cp lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/cc1.exe ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/ cp lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/collect2.exe ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/ cp lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/crt*.o ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver%%+*}/