gcc-13.1

3 files changed, 69 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cc7101a2f8b1..5c6bfb6a2e4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = djgpp-gcc
 	pkgdesc = GCC for the djgpp cross-compiler
-	pkgver = 12.2.0
+	pkgver = 13.1.0
 	pkgrel = 2
 	url = http://gcc.gnu.org
 	arch = i686
@@ -21,10 +21,10 @@ pkgbase = djgpp-gcc
 	options = staticlibs
 	options = !emptydirs
 	options = !buildflags
-	source = https://ftp.gnu.org/gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz
+	source = https://ftp.gnu.org/gnu/gcc/gcc-13.1.0/gcc-13.1.0.tar.xz
 	source = lto.patch
 	source = gcc-djgpp.diff
-	sha256sums = e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+	sha256sums = 61d684f0aa5e76ac6585ad8898a2427aade8979ed5e7f85492286c4dfc13ee86
 	sha256sums = c03dbd61274e1ce14f84366abf348d75779bbd6e0bc32b9f4fd74f1ce54a5ef0
 	sha256sums = 0c93c245f791d638cd775b00f9919873b229a4dda04a7a4072735d12d47737ce
 
diff --git a/PKGBUILD b/PKGBUILD
index 25caadbfba8a..c9c28bf06b50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: felix <base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg==>
 
 pkgname=djgpp-gcc
-pkgver=12.2.0
+pkgver=13.1.0
 _target="i686-pc-msdosdjgpp"
 _djver=2.05
 _build_ada=no
@@ -21,9 +21,9 @@ options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
 source=("https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz"
         "lto.patch"
 	"gcc-djgpp.diff")
-sha256sums=('e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff'
+sha256sums=('61d684f0aa5e76ac6585ad8898a2427aade8979ed5e7f85492286c4dfc13ee86'
             'c03dbd61274e1ce14f84366abf348d75779bbd6e0bc32b9f4fd74f1ce54a5ef0'
-            '0c93c245f791d638cd775b00f9919873b229a4dda04a7a4072735d12d47737ce')
+            '889673cbd6ff486d8eb406900eab607e15e350b4541e84868f3d1af6b541fe4f')
 
 prepare() {
   cd gcc-$pkgver
diff --git a/gcc-djgpp.diff b/gcc-djgpp.diff
index 991e740c80d4..b3d421af822f 100644
--- a/gcc-djgpp.diff
+++ b/gcc-djgpp.diff
@@ -1,8 +1,8 @@
 diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..3fa29ac57ea 100644
+index 06a9398e172..c5f04e56422 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -1469,7 +1469,6 @@ dvi-host: maybe-dvi-itcl
+@@ -1472,7 +1472,6 @@ dvi-host: maybe-dvi-itcl
  dvi-host: maybe-dvi-ld
  dvi-host: maybe-dvi-libbacktrace
  dvi-host: maybe-dvi-libcpp
@@ -10,7 +10,7 @@ index 593495e1650..3fa29ac57ea 100644
  dvi-host: maybe-dvi-libdecnumber
  dvi-host: maybe-dvi-libgui
  dvi-host: maybe-dvi-libiberty
-@@ -1559,7 +1558,6 @@ pdf-host: maybe-pdf-itcl
+@@ -1562,7 +1561,6 @@ pdf-host: maybe-pdf-itcl
  pdf-host: maybe-pdf-ld
  pdf-host: maybe-pdf-libbacktrace
  pdf-host: maybe-pdf-libcpp
@@ -18,7 +18,7 @@ index 593495e1650..3fa29ac57ea 100644
  pdf-host: maybe-pdf-libdecnumber
  pdf-host: maybe-pdf-libgui
  pdf-host: maybe-pdf-libiberty
-@@ -1649,7 +1647,6 @@ html-host: maybe-html-itcl
+@@ -1652,7 +1650,6 @@ html-host: maybe-html-itcl
  html-host: maybe-html-ld
  html-host: maybe-html-libbacktrace
  html-host: maybe-html-libcpp
@@ -26,7 +26,7 @@ index 593495e1650..3fa29ac57ea 100644
  html-host: maybe-html-libdecnumber
  html-host: maybe-html-libgui
  html-host: maybe-html-libiberty
-@@ -1739,7 +1736,6 @@ TAGS-host: maybe-TAGS-itcl
+@@ -1742,7 +1739,6 @@ TAGS-host: maybe-TAGS-itcl
  TAGS-host: maybe-TAGS-ld
  TAGS-host: maybe-TAGS-libbacktrace
  TAGS-host: maybe-TAGS-libcpp
@@ -34,7 +34,7 @@ index 593495e1650..3fa29ac57ea 100644
  TAGS-host: maybe-TAGS-libdecnumber
  TAGS-host: maybe-TAGS-libgui
  TAGS-host: maybe-TAGS-libiberty
-@@ -1829,7 +1825,6 @@ install-info-host: maybe-install-info-itcl
+@@ -1832,7 +1828,6 @@ install-info-host: maybe-install-info-itcl
  install-info-host: maybe-install-info-ld
  install-info-host: maybe-install-info-libbacktrace
  install-info-host: maybe-install-info-libcpp
@@ -42,7 +42,7 @@ index 593495e1650..3fa29ac57ea 100644
  install-info-host: maybe-install-info-libdecnumber
  install-info-host: maybe-install-info-libgui
  install-info-host: maybe-install-info-libiberty
-@@ -2009,7 +2004,6 @@ install-pdf-host: maybe-install-pdf-itcl
+@@ -2012,7 +2007,6 @@ install-pdf-host: maybe-install-pdf-itcl
  install-pdf-host: maybe-install-pdf-ld
  install-pdf-host: maybe-install-pdf-libbacktrace
  install-pdf-host: maybe-install-pdf-libcpp
@@ -50,7 +50,7 @@ index 593495e1650..3fa29ac57ea 100644
  install-pdf-host: maybe-install-pdf-libdecnumber
  install-pdf-host: maybe-install-pdf-libgui
  install-pdf-host: maybe-install-pdf-libiberty
-@@ -2099,7 +2093,6 @@ install-html-host: maybe-install-html-itcl
+@@ -2102,7 +2096,6 @@ install-html-host: maybe-install-html-itcl
  install-html-host: maybe-install-html-ld
  install-html-host: maybe-install-html-libbacktrace
  install-html-host: maybe-install-html-libcpp
@@ -59,7 +59,7 @@ index 593495e1650..3fa29ac57ea 100644
  install-html-host: maybe-install-html-libgui
  install-html-host: maybe-install-html-libiberty
 diff --git a/c++tools/resolver.cc b/c++tools/resolver.cc
-index 1fe9c17e0fe..9862f4aaa15 100644
+index d1f009cab64..ce1e29da817 100644
 --- a/c++tools/resolver.cc
 +++ b/c++tools/resolver.cc
 @@ -33,13 +33,13 @@ along with GCC; see the file COPYING3.  If not see
@@ -79,10 +79,10 @@ index 1fe9c17e0fe..9862f4aaa15 100644
  #define MAPPED_READING 1
  #else
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 591d033fbca..2c26f55851b 100644
+index 8522094164e..d850d27a3dc 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
-@@ -298,6 +298,12 @@ char __gnat_dir_separator = DIR_SEPARATOR;
+@@ -295,6 +295,12 @@ char __gnat_dir_separator = DIR_SEPARATOR;
  
  char __gnat_path_separator = PATH_SEPARATOR;
  
@@ -95,7 +95,7 @@ index 591d033fbca..2c26f55851b 100644
  /* The GNAT_LIBRARY_TEMPLATE contains a list of expressions that define
     the base filenames that libraries specified with -lsomelib options
     may have. This is used by GNATMAKE to check whether an executable
-@@ -597,7 +603,11 @@ __gnat_try_lock (char *dir, char *file)
+@@ -589,7 +595,11 @@ __gnat_try_lock (char *dir, char *file)
  int
  __gnat_get_maximum_file_name_length (void)
  {
@@ -108,20 +108,20 @@ index 591d033fbca..2c26f55851b 100644
  
  /* Return nonzero if file names are case sensitive.  */
 diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
-index a8d8899d3c9..359d3334898 100644
+index 9507f2f0920..f6ca2911534 100644
 --- a/gcc/ada/gcc-interface/Make-lang.in
 +++ b/gcc/ada/gcc-interface/Make-lang.in
-@@ -1152,7 +1152,7 @@ ada/generated/gnatvsn.ads: ada/gnatvsn.ads BASE-VER ada/GNAT_DATE
+@@ -1166,7 +1166,7 @@ ada/generated/gnatvsn.ads: ada/gnatvsn.ads BASE-VER ada/GNAT_DATE
  	s=`cat $(srcdir)/BASE-VER | sed -e "s/\([0-9]*\)\.\([0-9]*\)\..*/-\1\2/g"`; \
  	d=`if test -f $(srcdir)/ada/GNAT_DATE; then \
             cat $(srcdir)/ada/GNAT_DATE; else date +%Y%m%d; fi`; \
--	cat $< | sed -e "/Version/s/(\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\).*)/($$d$$s)/g" >$@
-+	cat $< | sed -e "/Version/s/(\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\).*)/($$d$$s)/g" | tr -d \\\015 >$@
+-	cat $< | sed -e "/Version/s/(\([0-9]\{8\}\).*)/($$d$$s)/g" >$@
++	cat $< | sed -e "/Version/s/(\([0-9]\{8\}\).*)/($$d$$s)/g"  | tr -d \\\015 >$@
  
  ada/gnatvsn.o : ada/gnatvsn.adb ada/generated/gnatvsn.ads
  	$(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION)
 diff --git a/gcc/ada/libgnarl/s-taprop__dummy.adb b/gcc/ada/libgnarl/s-taprop__dummy.adb
-index 5ab41b1b3c1..fb4bd5cc777 100644
+index ced2a0c6f3c..34af507e275 100644
 --- a/gcc/ada/libgnarl/s-taprop__dummy.adb
 +++ b/gcc/ada/libgnarl/s-taprop__dummy.adb
 @@ -37,7 +37,7 @@
@@ -134,7 +134,7 @@ index 5ab41b1b3c1..fb4bd5cc777 100644
     pragma Warnings (Off);
     --  Turn off warnings since so many unreferenced parameters
 diff --git a/gcc/ada/libgnat/s-os_lib.adb b/gcc/ada/libgnat/s-os_lib.adb
-index 0681580b9b2..a1bff26e216 100644
+index 2647b981b18..0d31b3f1b39 100644
 --- a/gcc/ada/libgnat/s-os_lib.adb
 +++ b/gcc/ada/libgnat/s-os_lib.adb
 @@ -73,7 +73,7 @@ package body System.OS_Lib is
@@ -160,7 +160,7 @@ index 0681580b9b2..a1bff26e216 100644
              if Path_Buffer (Index) = '/' then
                 Path_Buffer (Index) := Directory_Separator;
 diff --git a/gcc/ada/libgnat/s-os_lib.ads b/gcc/ada/libgnat/s-os_lib.ads
-index 503793f8ab2..d3cbd803ddf 100644
+index 9be09b39bf6..340fe0b9e42 100644
 --- a/gcc/ada/libgnat/s-os_lib.ads
 +++ b/gcc/ada/libgnat/s-os_lib.ads
 @@ -1100,9 +1100,12 @@ package System.OS_Lib is
@@ -177,7 +177,7 @@ index 503793f8ab2..d3cbd803ddf 100644
     pragma Import (C, Current_Process_Id, "__gnat_current_process_id");
  
 diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c
-index af6919092d5..f7745325759 100644
+index 5480e55a5bb..010f8204aad 100644
 --- a/gcc/ada/s-oscons-tmplt.c
 +++ b/gcc/ada/s-oscons-tmplt.c
 @@ -121,7 +121,7 @@ pragma Style_Checks ("M32766");
@@ -190,7 +190,7 @@ index af6919092d5..f7745325759 100644
  #endif
  
 diff --git a/gcc/collect2.cc b/gcc/collect2.cc
-index d81c7f28f16..1f48973eb66 100644
+index 63b9a0c233a..795bd01ca3b 100644
 --- a/gcc/collect2.cc
 +++ b/gcc/collect2.cc
 @@ -1159,18 +1159,27 @@ main (int argc, char **argv)
@@ -226,7 +226,7 @@ index d81c7f28f16..1f48973eb66 100644
        export_file = make_temp_file (".x");
  #endif
 diff --git a/gcc/config/i386/djgpp.cc b/gcc/config/i386/djgpp.cc
-index f1641a475c7..ab0fa0b7dfc 100644
+index 0b83451fda5..897079e6c68 100644
 --- a/gcc/config/i386/djgpp.cc
 +++ b/gcc/config/i386/djgpp.cc
 @@ -36,6 +36,8 @@ i386_djgpp_asm_named_section(const char *name, unsigned int flags,
@@ -239,7 +239,7 @@ index f1641a475c7..ab0fa0b7dfc 100644
    /* LTO sections need 1-byte alignment to avoid confusing the
       zlib decompression algorithm with trailing zero pad bytes.  */
 diff --git a/gcc/config/i386/xm-djgpp.h b/gcc/config/i386/xm-djgpp.h
-index 1aff35ff87c..f557a82909a 100644
+index de2c1795dbc..4063ba28632 100644
 --- a/gcc/config/i386/xm-djgpp.h
 +++ b/gcc/config/i386/xm-djgpp.h
 @@ -30,6 +30,8 @@ along with GCC; see the file COPYING3.  If not see
@@ -264,7 +264,7 @@ index 1aff35ff87c..f557a82909a 100644
  #define MAX_OFILE_ALIGNMENT 128
  
 diff --git a/gcc/cp/mapper-client.cc b/gcc/cp/mapper-client.cc
-index fe9544b5ba4..4ee44c1a366 100644
+index 39e80df2d25..641849f1c01 100644
 --- a/gcc/cp/mapper-client.cc
 +++ b/gcc/cp/mapper-client.cc
 @@ -19,7 +19,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -277,10 +277,10 @@ index fe9544b5ba4..4ee44c1a366 100644
  // will include it later under the above check
  #include <sys/socket.h>
 diff --git a/gcc/diagnostic-show-locus.cc b/gcc/diagnostic-show-locus.cc
-index 6eafe19785f..8a32a9e30b7 100644
+index 0514815b51f..6b5285b5330 100644
 --- a/gcc/diagnostic-show-locus.cc
 +++ b/gcc/diagnostic-show-locus.cc
-@@ -5688,7 +5688,9 @@ diagnostic_show_locus_cc_tests ()
+@@ -5721,7 +5721,9 @@ diagnostic_show_locus_cc_tests ()
    for_each_line_table_case (test_fixit_replace_containing_newline);
    for_each_line_table_case (test_fixit_deletion_affecting_newline);
    for_each_line_table_case (test_tab_expansion);
@@ -291,10 +291,10 @@ index 6eafe19785f..8a32a9e30b7 100644
  
    test_line_numbers_multiline_range ();
 diff --git a/gcc/gcov-tool.cc b/gcc/gcov-tool.cc
-index f4e42ae763c..11b10d4c8e8 100644
+index 76173fdaef7..6fd0066ef20 100644
 --- a/gcc/gcov-tool.cc
 +++ b/gcc/gcov-tool.cc
-@@ -56,11 +56,18 @@ static bool verbose;
+@@ -58,11 +58,18 @@ static bool verbose;
  
  /* Remove file NAME if it has a gcda suffix. */
  
@@ -313,7 +313,7 @@ index f4e42ae763c..11b10d4c8e8 100644
  {
    int ret = 0;
    int len = strlen (name);
-@@ -82,7 +89,11 @@ static int
+@@ -84,7 +91,11 @@ static int
  unlink_profile_dir (const char *path ATTRIBUTE_UNUSED)
  {
  #if HAVE_FTW_H
@@ -326,7 +326,7 @@ index f4e42ae763c..11b10d4c8e8 100644
      return -1;
  #endif
 diff --git a/gcc/ggc-common.cc b/gcc/ggc-common.cc
-index 755d166417a..e63b27d573a 100644
+index db317f49993..8d1de076010 100644
 --- a/gcc/ggc-common.cc
 +++ b/gcc/ggc-common.cc
 @@ -31,6 +31,12 @@ along with GCC; see the file COPYING3.  If not see
@@ -343,7 +343,7 @@ index 755d166417a..e63b27d573a 100644
  bool ggc_protect_identifiers = true;
  
 diff --git a/gcc/ginclude/float.h b/gcc/ginclude/float.h
-index 9d368c4afa5..ed99aad4934 100644
+index 45021e48b8f..1f7f051e54b 100644
 --- a/gcc/ginclude/float.h
 +++ b/gcc/ginclude/float.h
 @@ -25,6 +25,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -358,7 +358,7 @@ index 9d368c4afa5..ed99aad4934 100644
  #define _FLOAT_H___
  
 diff --git a/include/libiberty.h b/include/libiberty.h
-index a65ced9c820..ffd8220c743 100644
+index 1d5c779fcff..787507dfe93 100644
 --- a/include/libiberty.h
 +++ b/include/libiberty.h
 @@ -108,6 +108,7 @@ extern int countargv (char * const *);
@@ -387,7 +387,7 @@ index 789ce9e70b7..8794e4dd8e6 100644
  #include <memory>
  #include <string>
 diff --git a/libcpp/files.cc b/libcpp/files.cc
-index 24208f7b0f8..6ba6fc571e1 100644
+index 3f8a8106ec8..343965d84bd 100644
 --- a/libcpp/files.cc
 +++ b/libcpp/files.cc
 @@ -747,6 +747,10 @@ read_file_guts (cpp_reader *pfile, _cpp_file *file, location_t loc,
@@ -402,10 +402,10 @@ index 24208f7b0f8..6ba6fc571e1 100644
  				     input_charset,
  				     buf, size + 16, total,
 diff --git a/libcpp/lex.cc b/libcpp/lex.cc
-index fb1dfabb7af..54886789c34 100644
+index 45ea16a91bc..b0e7a219d10 100644
 --- a/libcpp/lex.cc
 +++ b/libcpp/lex.cc
-@@ -502,6 +502,13 @@ init_vectorized_lexer (void)
+@@ -505,6 +505,13 @@ init_vectorized_lexer (void)
    search_line_fast_type impl = search_line_acc_char;
    int minimum = 0;
  
@@ -419,7 +419,7 @@ index fb1dfabb7af..54886789c34 100644
  #if defined(__SSE4_2__)
    minimum = 3;
  #elif defined(__SSE2__)
-@@ -528,6 +535,8 @@ init_vectorized_lexer (void)
+@@ -531,6 +538,8 @@ init_vectorized_lexer (void)
  	impl = search_line_mmx;
      }
  
@@ -429,10 +429,10 @@ index fb1dfabb7af..54886789c34 100644
  }
  
 diff --git a/libffi/src/x86/sysv.S b/libffi/src/x86/sysv.S
-index 7110f02f5f3..d079e22c976 100644
+index c7a0fb51b48..5c724e24d8b 100644
 --- a/libffi/src/x86/sysv.S
 +++ b/libffi/src/x86/sysv.S
-@@ -921,7 +921,7 @@ ENDF(C(__x86.get_pc_thunk.dx))
+@@ -968,7 +968,7 @@ ENDF(C(__x86.get_pc_thunk.dx))
  #ifdef __APPLE__
  .section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support
  EHFrame0:
@@ -442,10 +442,10 @@ index 7110f02f5f3..d079e22c976 100644
  #elif defined(HAVE_AS_X86_64_UNWIND_SECTION_TYPE)
  .section .eh_frame,EH_FRAME_FLAGS,@unwind
 diff --git a/libgcc/libgcov-util.c b/libgcc/libgcov-util.c
-index ba7fb924b53..a6c23301fc7 100644
+index d547c103cab..d939b1e1cbb 100644
 --- a/libgcc/libgcov-util.c
 +++ b/libgcc/libgcov-util.c
-@@ -392,7 +392,11 @@ read_gcda_file (const char *filename)
+@@ -381,7 +381,11 @@ read_gcda_file (const char *filename)
  
  static int
  ftw_read_file (const char *filename,
@@ -456,12 +456,12 @@ index ba7fb924b53..a6c23301fc7 100644
 +#endif
                 int type)
  {
-   int filename_len;
+   size_t filename_len;
 diff --git a/libgcc/libgcov.h b/libgcc/libgcov.h
-index c77a74a3e53..2c7781d3354 100644
+index 92df440d401..7df201fe40a 100644
 --- a/libgcc/libgcov.h
 +++ b/libgcc/libgcov.h
-@@ -164,6 +164,11 @@ extern struct gcov_info *gcov_list;
+@@ -163,6 +163,11 @@ extern struct gcov_info *gcov_list;
  
  #endif /* !IN_GCOV_TOOL */
  
@@ -474,7 +474,7 @@ index c77a74a3e53..2c7781d3354 100644
  #define IN_LIBGCOV (-1)
  #else
 diff --git a/libgfortran/intrinsics/chmod.c b/libgfortran/intrinsics/chmod.c
-index 76f82b8828b..15971189648 100644
+index 850c2ccebbf..ee17e421c29 100644
 --- a/libgfortran/intrinsics/chmod.c
 +++ b/libgfortran/intrinsics/chmod.c
 @@ -445,7 +445,7 @@ clause_done:
@@ -505,7 +505,7 @@ index 76f82b8828b..15971189648 100644
  	  file_mode |= S_ISVTX;
  	else if (!is_dir)
 diff --git a/libgfortran/intrinsics/execute_command_line.c b/libgfortran/intrinsics/execute_command_line.c
-index 1fac10a9e08..0ea4b7f68f3 100644
+index c2bcaf05f0b..889bd637f18 100644
 --- a/libgfortran/intrinsics/execute_command_line.c
 +++ b/libgfortran/intrinsics/execute_command_line.c
 @@ -98,7 +98,7 @@ execute_command_line (const char *command, bool wait, int *exitstat,
@@ -518,7 +518,7 @@ index 1fac10a9e08..0ea4b7f68f3 100644
        bool sig_init = __atomic_load_n (&sig_init_saved, __ATOMIC_RELAXED);
        if (!sig_init)
 diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c
-index 616c1aab166..6a772c4a3d3 100644
+index ba12be08252..7ac07f3f4a8 100644
 --- a/libgfortran/io/unix.c
 +++ b/libgfortran/io/unix.c
 @@ -221,6 +221,9 @@ typedef struct
@@ -560,7 +560,7 @@ index 616c1aab166..6a772c4a3d3 100644
      return NULL;
  
 diff --git a/libiberty/make-relative-prefix.c b/libiberty/make-relative-prefix.c
-index 18d55b6bc68..28bcd07ed1d 100644
+index 1b970e7a773..0eb30c02a60 100644
 --- a/libiberty/make-relative-prefix.c
 +++ b/libiberty/make-relative-prefix.c
 @@ -65,6 +65,7 @@ relative prefix can be found, return @code{NULL}.
@@ -590,10 +590,10 @@ index 18d55b6bc68..28bcd07ed1d 100644
      }
  
 diff --git a/libiberty/make-temp-file.c b/libiberty/make-temp-file.c
-index 7bfc65ea613..eec49a447be 100644
+index 1d2f21d6c5c..885d29c9c72 100644
 --- a/libiberty/make-temp-file.c
 +++ b/libiberty/make-temp-file.c
-@@ -51,6 +51,7 @@ Boston, MA 02110-1301, USA.  */
+@@ -52,6 +52,7 @@ Boston, MA 02110-1301, USA.  */
  #endif
  
  #include "libiberty.h"
@@ -601,7 +601,7 @@ index 7bfc65ea613..eec49a447be 100644
  extern int mkstemps (char *, int);
  
  /* '/' works just fine on MS-DOS based systems.  */
-@@ -153,7 +154,8 @@ choose_tmpdir (void)
+@@ -154,7 +155,8 @@ choose_tmpdir (void)
        len = strlen (base);
        tmpdir = XNEWVEC (char, len + 2);
        strcpy (tmpdir, base);
@@ -612,7 +612,7 @@ index 7bfc65ea613..eec49a447be 100644
        memoized_tmpdir = tmpdir;
  #else /* defined(_WIN32) && !defined(__CYGWIN__) */
 diff --git a/libiberty/simple-object-elf.c b/libiberty/simple-object-elf.c
-index 677a18a7776..0fde7757d9a 100644
+index eee07039984..2997ae21655 100644
 --- a/libiberty/simple-object-elf.c
 +++ b/libiberty/simple-object-elf.c
 @@ -1293,7 +1293,9 @@ simple_object_elf_copy_lto_debug_sections (simple_object_read *sobj,
@@ -649,7 +649,7 @@ index 32ebcec928c..96498b7c408 100644
  #else
  #define L_(x) x
 diff --git a/libstdc++-v3/config/os/djgpp/ctype_configure_char.cc b/libstdc++-v3/config/os/djgpp/ctype_configure_char.cc
-index 5e1370d2985..c9f41b6d526 100644
+index 55cbcaf92c4..f3603555909 100644
 --- a/libstdc++-v3/config/os/djgpp/ctype_configure_char.cc
 +++ b/libstdc++-v3/config/os/djgpp/ctype_configure_char.cc
 @@ -45,7 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -671,7 +671,7 @@ index 5e1370d2985..c9f41b6d526 100644
    {
      memset(_M_widen, 0, sizeof(_M_widen));
 diff --git a/libstdc++-v3/config/os/djgpp/error_constants.h b/libstdc++-v3/config/os/djgpp/error_constants.h
-index 4b25929ddae..eb3d507858e 100644
+index 834f2e04b43..f2ae54a6c76 100644
 --- a/libstdc++-v3/config/os/djgpp/error_constants.h
 +++ b/libstdc++-v3/config/os/djgpp/error_constants.h
 @@ -33,16 +33,42 @@
@@ -896,7 +896,7 @@ index 4b25929ddae..eb3d507858e 100644
  
  _GLIBCXX_END_NAMESPACE_VERSION
 diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h
-index 19d246100cb..1463a59b45a 100644
+index e0e47188bb9..488c3043815 100644
 --- a/libstdc++-v3/include/experimental/bits/fs_path.h
 +++ b/libstdc++-v3/include/experimental/bits/fs_path.h
 @@ -53,6 +53,11 @@
@@ -920,7 +920,7 @@ index 19d246100cb..1463a59b45a 100644
  #else
        return __ch == '/';
  #endif
-@@ -998,6 +1005,9 @@ namespace __detail
+@@ -1027,6 +1034,9 @@ namespace __detail
  #ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
      std::replace(_M_pathname.begin(), _M_pathname.end(), L'/',
  		 preferred_separator);
@@ -930,7 +930,7 @@ index 19d246100cb..1463a59b45a 100644
  #endif
      return *this;
    }
-@@ -1221,7 +1231,7 @@ namespace __detail
+@@ -1249,7 +1259,7 @@ namespace __detail
    inline bool
    path::is_absolute() const
    {
@@ -940,23 +940,24 @@ index 19d246100cb..1463a59b45a 100644
  #else
      return has_root_directory();
 diff --git a/libstdc++-v3/src/c++11/shared_ptr.cc b/libstdc++-v3/src/c++11/shared_ptr.cc
-index 8e84672d603..54adbdacfef 100644
+index 74e879e5828..a4785c71eaa 100644
 --- a/libstdc++-v3/src/c++11/shared_ptr.cc
 +++ b/libstdc++-v3/src/c++11/shared_ptr.cc
-@@ -35,7 +35,11 @@ namespace __gnu_internal _GLIBCXX_VISIBILITY(hidden)
+@@ -35,7 +35,12 @@ namespace __gnu_internal _GLIBCXX_VISIBILITY(hidden)
    get_mutex(unsigned char i)
    {
      // increase alignment to put each lock on a separate cache line
++    // increase alignment to put each lock on a separate cache line
 +#ifdef __DJGPP__
 +    struct M : __gnu_cxx::__mutex { };
 +#else
      struct alignas(64) M : __gnu_cxx::__mutex { };
 +#endif
-     static M m[mask + 1];
-     return m[i];
-   }
+     // Use a static buffer, so that the mutexes are not destructed
+     // before potential users (or at all)
+     static __attribute__ ((aligned(__alignof__(M))))
 diff --git a/libstdc++-v3/src/filesystem/path.cc b/libstdc++-v3/src/filesystem/path.cc
-index cb8d2c67941..186f86401cb 100644
+index 4c218bdae49..6c345d2e51b 100644
 --- a/libstdc++-v3/src/filesystem/path.cc
 +++ b/libstdc++-v3/src/filesystem/path.cc
 @@ -411,8 +411,13 @@ path::_M_split_cmpts()