Update to gcc-10.2.0

3 files changed, 48 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8bcef36dda98..0f432b7b662f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = djgpp-gcc
 	pkgdesc = GCC for the djgpp cross-compiler
-	pkgver = 10.1.0
-	pkgrel = 2
+	pkgver = 10.2.0
+	pkgrel = 1
 	url = http://gcc.gnu.org
 	arch = i686
 	arch = x86_64
@@ -19,14 +19,14 @@ pkgbase = djgpp-gcc
 	options = !strip
 	options = staticlibs
 	options = !emptydirs
-	source = https://ftp.gnu.org/gnu/gcc/gcc-10.1.0/gcc-10.1.0.tar.xz
+	source = https://ftp.gnu.org/gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz
 	source = http://isl.gforge.inria.fr/isl-0.20.tar.bz2
 	source = lto.patch
 	source = gcc-djgpp.diff
-	sha256sums = b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2
+	sha256sums = b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c
 	sha256sums = b587e083eb65a8b394e833dea1744f21af3f0e413a448c17536b5549ae42a4c2
 	sha256sums = c03dbd61274e1ce14f84366abf348d75779bbd6e0bc32b9f4fd74f1ce54a5ef0
-	sha256sums = ff8038e8feef213b9a79dfc604c37a267dbdd0c66f333547909f2af17c6d7a9d
+	sha256sums = 6868491ef9571e2ca79cf25512f06edbfad9bffb833f1715380e9228d1ef6963
 
 pkgname = djgpp-gcc
 
diff --git a/PKGBUILD b/PKGBUILD
index e858a15b3232..99bcd5da8406 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 # Contributor: felix <base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg==>
 
 pkgname=djgpp-gcc
-pkgver=10.1.0
+pkgver=10.2.0
 _target="i686-pc-msdosdjgpp"
 _islver=0.20
 _djver=2.05
-pkgrel=2
+pkgrel=1
 pkgdesc="GCC for the djgpp cross-compiler"
 arch=('i686' 'x86_64')
 url="http://gcc.gnu.org"
@@ -22,10 +22,10 @@ source=("https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz"
         "http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2"
         "lto.patch"
 	"gcc-djgpp.diff")
-sha256sums=('b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2'
+sha256sums=('b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c'
             'b587e083eb65a8b394e833dea1744f21af3f0e413a448c17536b5549ae42a4c2'
             'c03dbd61274e1ce14f84366abf348d75779bbd6e0bc32b9f4fd74f1ce54a5ef0'
-            'ff8038e8feef213b9a79dfc604c37a267dbdd0c66f333547909f2af17c6d7a9d')
+            '6868491ef9571e2ca79cf25512f06edbfad9bffb833f1715380e9228d1ef6963')
 
 prepare() {
   cd gcc-$pkgver
diff --git a/gcc-djgpp.diff b/gcc-djgpp.diff
index 7abfd525e4ae..b3b69d166717 100644
--- a/gcc-djgpp.diff
+++ b/gcc-djgpp.diff
@@ -96,6 +96,42 @@ index 99406e9a77d..a35507806a6 100644
     pragma Import (C, Current_Time, "__gnat_current_time");
     pragma Import (C, Current_Process_Id, "__gnat_current_process_id");
  
+diff --git a/gcc/collect2.c b/gcc/collect2.c
+index f8a5ce45994..2c3a612d49f 100644
+--- a/gcc/collect2.c
++++ b/gcc/collect2.c
+@@ -1180,18 +1180,27 @@ main (int argc, char **argv)
+   *ld1++ = *ld2++ = ld_file_name;
+ 
+   /* Make temp file names.  */
++
++#ifdef __DJGPP__
++#define CDTOR_C_NAME ".ctc"
++#define CDTOR_O_NAME ".cto"
++#else
++#define CDTOR_C_NAME ".cdtor.c"
++#define CDTOR_O_NAME ".cdtor.o"
++#endif
++
+   if (save_temps)
+     {
+-      c_file = concat (output_file, ".cdtor.c", NULL);
+-      o_file = concat (output_file, ".cdtor.o", NULL);
++      c_file = concat (output_file, CDTOR_C_NAME, NULL);
++      o_file = concat (output_file, CDTOR_O_NAME, NULL);
+ #ifdef COLLECT_EXPORT_LIST
+       export_file = concat (output_file, ".x", NULL);
+ #endif
+     }
+   else
+     {
+-      c_file = make_temp_file (".cdtor.c");
+-      o_file = make_temp_file (".cdtor.o");
++      c_file = make_temp_file (CDTOR_C_NAME);
++      o_file = make_temp_file (CDTOR_O_NAME);
+ #ifdef COLLECT_EXPORT_LIST
+       export_file = make_temp_file (".x");
+ #endif
 diff --git a/gcc/config/i386/djgpp.c b/gcc/config/i386/djgpp.c
 index ba6c2d4d3a4..88cf1e6506e 100644
 --- a/gcc/config/i386/djgpp.c
@@ -307,10 +343,10 @@ index 78f245bda07..1ae18b248a7 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 449638bc4b6..218ee34b269 100644
+index fff54c6a3f6..c4879c6bf99 100644
 --- a/libgcc/libgcov-util.c
 +++ b/libgcc/libgcov-util.c
-@@ -391,7 +391,11 @@ read_gcda_file (const char *filename)
+@@ -390,7 +390,11 @@ read_gcda_file (const char *filename)
  
  static int
  ftw_read_file (const char *filename,
@@ -559,7 +595,7 @@ index e0a67bc8d6d..d6ccf4195d6 100644
  
  #ifdef _GLIBCXX_HAVE_EOWNERDEAD
 diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h
-index d7234c08a00..bf31e8184cb 100644
+index 69b823a3466..2d005b875e4 100644
 --- a/libstdc++-v3/include/experimental/bits/fs_path.h
 +++ b/libstdc++-v3/include/experimental/bits/fs_path.h
 @@ -53,6 +53,11 @@