Update to gcc-8.3.0

3 files changed, 17 insertions, 98 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17da44ecb073..572e8ac07e3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = djgpp-gcc
 	pkgdesc = GCC for the djgpp cross-compiler
-	pkgver = 8.2.0
-	pkgrel = 2
+	pkgver = 8.3.0
+	pkgrel = 1
 	url = http://gcc.gnu.org
 	arch = i686
 	arch = x86_64
@@ -18,14 +18,14 @@ pkgbase = djgpp-gcc
 	options = !strip
 	options = staticlibs
 	options = !emptydirs
-	source = https://ftp.gnu.org/gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz
+	source = https://ftp.gnu.org/gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz
 	source = http://isl.gforge.inria.fr/isl-0.18.tar.bz2
 	source = lto.patch
 	source = gcc-djgpp.diff
-	sha256sums = 196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080
+	sha256sums = 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
 	sha256sums = 6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b
 	sha256sums = c03dbd61274e1ce14f84366abf348d75779bbd6e0bc32b9f4fd74f1ce54a5ef0
-	sha256sums = a1c0cd9a7ed1803efee3b585e43596630ea3bfeca1b3e37321e6468bd3d30e96
+	sha256sums = a5b493c9550314eb21bf2bfd85707a217cccd3caf6e02a3e2f6f2b9befa5348b
 
 pkgname = djgpp-gcc
 
diff --git a/PKGBUILD b/PKGBUILD
index f59ef65032e7..d9e28e659d63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 # Contributor: felix <base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg==>
 
 pkgname=djgpp-gcc
-pkgver=8.2.0
+pkgver=8.3.0
 _target="i686-pc-msdosdjgpp"
 _islver=0.18
 _djver=2.05
-pkgrel=2
+pkgrel=1
 pkgdesc="GCC for the djgpp cross-compiler"
 arch=('i686' 'x86_64')
 url="http://gcc.gnu.org"
@@ -21,10 +21,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=('196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080'
+sha256sums=('64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c'
             '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
             'c03dbd61274e1ce14f84366abf348d75779bbd6e0bc32b9f4fd74f1ce54a5ef0'
-            'a1c0cd9a7ed1803efee3b585e43596630ea3bfeca1b3e37321e6468bd3d30e96')
+            'a5b493c9550314eb21bf2bfd85707a217cccd3caf6e02a3e2f6f2b9befa5348b')
 
 prepare() {
   cd gcc-$pkgver
diff --git a/gcc-djgpp.diff b/gcc-djgpp.diff
index 6db9acafe898..ed2a2cbf0366 100644
--- a/gcc-djgpp.diff
+++ b/gcc-djgpp.diff
@@ -1,5 +1,5 @@
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 3b0aea92c05..02013b9f01a 100644
+index 41434655865..a3bfd1c24e1 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
 @@ -247,6 +247,12 @@ char __gnat_dir_separator = DIR_SEPARATOR;
@@ -97,55 +97,6 @@ index 1e2ffa354a3..40d3b689bbd 100644
     pragma Import (C, Current_Time, "__gnat_current_time");
     pragma Import (C, Current_Process_Id, "__gnat_current_process_id");
  
-diff --git a/gcc/config/i386/djgpp.c b/gcc/config/i386/djgpp.c
-index f168eed6f06..d187c3a7452 100644
---- a/gcc/config/i386/djgpp.c
-+++ b/gcc/config/i386/djgpp.c
-@@ -47,3 +47,20 @@ i386_djgpp_asm_named_section(const char *name, unsigned int flags,
- 
-   fprintf (asm_out_file, "\t.section\t%s,\"%s\"\n", name, flagchars);
- }
-+
-+/* Kludge because of missing COFF support for early LTO debug.  */
-+
-+static enum debug_info_levels saved_debug_info_level;
-+
-+void
-+i386_djgpp_asm_lto_start (void)
-+{
-+  saved_debug_info_level = debug_info_level;
-+  debug_info_level = DINFO_LEVEL_NONE;
-+}
-+
-+void
-+i386_djgpp_asm_lto_end (void)
-+{
-+  debug_info_level = saved_debug_info_level;
-+}
-diff --git a/gcc/config/i386/djgpp.h b/gcc/config/i386/djgpp.h
-index 42130edf95c..e95bc09bf69 100644
---- a/gcc/config/i386/djgpp.h
-+++ b/gcc/config/i386/djgpp.h
-@@ -160,8 +160,19 @@ along with GCC; see the file COPYING3.  If not see
- #undef MAKE_DECL_ONE_ONLY
- #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1)
- 
-+#undef TARGET_COFF
-+#define TARGET_COFF 1
-+
-+/* Kludge because of missing COFF support for early LTO debug.  */
-+#undef  TARGET_ASM_LTO_START
-+#define TARGET_ASM_LTO_START i386_djgpp_asm_lto_start
-+#undef  TARGET_ASM_LTO_END
-+#define TARGET_ASM_LTO_END i386_djgpp_asm_lto_end
-+
- /* Function protypes for gcc/i386/djgpp.c */
- 
- void
- i386_djgpp_asm_named_section(const char *name, unsigned int flags,
- 			     tree decl);
-+void i386_djgpp_asm_lto_start (void);
-+void i386_djgpp_asm_lto_end (void);
 diff --git a/gcc/config/i386/xm-djgpp.h b/gcc/config/i386/xm-djgpp.h
 index 02096925a88..066417f1d50 100644
 --- a/gcc/config/i386/xm-djgpp.h
@@ -171,38 +122,6 @@ index 02096925a88..066417f1d50 100644
  #undef MAX_OFILE_ALIGNMENT
  #define MAX_OFILE_ALIGNMENT 128
  
-diff --git a/gcc/defaults.h b/gcc/defaults.h
-index 78a08a33f12..9035b333be8 100644
---- a/gcc/defaults.h
-+++ b/gcc/defaults.h
-@@ -1282,6 +1282,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define TARGET_PECOFF 0
- #endif
- 
-+#ifndef TARGET_COFF
-+#define TARGET_COFF 0
-+#endif
-+
- #ifndef EH_RETURN_HANDLER_RTX
- #define EH_RETURN_HANDLER_RTX NULL
- #endif
-diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
-index d94cf7dc928..9f6855e6695 100644
---- a/gcc/dwarf2out.c
-+++ b/gcc/dwarf2out.c
-@@ -31832,10 +31832,10 @@ dwarf2out_early_finish (const char *filename)
- 
-   /* Do not generate DWARF assembler now when not producing LTO bytecode.  */
-   if ((!flag_generate_lto && !flag_generate_offload)
--      /* FIXME: Disable debug info generation for PE-COFF targets since the
-+      /* FIXME: Disable debug info generation for (PE-)COFF targets since the
- 	 copy_lto_debug_sections operation of the simple object support in
- 	 libiberty is not implemented for them yet.  */
--      || TARGET_PECOFF)
-+      || TARGET_PECOFF || TARGET_COFF)
-     return;
- 
-   /* Now as we are going to output for LTO initialize sections and labels
 diff --git a/gcc/gcov-tool.c b/gcc/gcov-tool.c
 index 15fd710b18c..91d4c87b31b 100644
 --- a/gcc/gcov-tool.c
@@ -406,10 +325,10 @@ index 1299159a7f1..e1bd7a1c633 100644
  	  file_mode |= S_ISVTX;
  	else if (!is_dir)
 diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c
-index a8fd07a5f3b..385640ab903 100644
+index 428760fc315..682c305fe52 100644
 --- a/libgfortran/io/unix.c
 +++ b/libgfortran/io/unix.c
-@@ -210,6 +210,9 @@ typedef struct
+@@ -218,6 +218,9 @@ typedef struct
  }
  unix_stream;
  
@@ -419,7 +338,7 @@ index a8fd07a5f3b..385640ab903 100644
  
  /* fix_fd()-- Given a file descriptor, make sure it is not one of the
     standard descriptors, returning a non-standard descriptor.  If the
-@@ -1190,8 +1193,13 @@ tempfile_open (const char *tempdir, char **fname)
+@@ -1198,8 +1201,13 @@ tempfile_open (const char *tempdir, char **fname)
    char *template = xmalloc (tempdirlen + 23);
  
  #ifdef HAVE_MKSTEMP
@@ -433,7 +352,7 @@ index a8fd07a5f3b..385640ab903 100644
  
  #ifdef HAVE_UMASK
    /* Temporarily set the umask such that the file has 0600 permissions.  */
-@@ -1557,6 +1565,13 @@ open_external (st_parameter_open *opp, unit_flags *flags)
+@@ -1565,6 +1573,13 @@ open_external (st_parameter_open *opp, unit_flags *flags)
      return NULL;
    fd = fix_fd (fd);
  
@@ -576,7 +495,7 @@ index 4e5590f9160..f78405afa03 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 ada7c1791aa..1ec60b2ffc9 100644
+index 088d62f8f43..9cba93e5719 100644
 --- a/libstdc++-v3/include/experimental/bits/fs_path.h
 +++ b/libstdc++-v3/include/experimental/bits/fs_path.h
 @@ -53,6 +53,11 @@
@@ -591,7 +510,7 @@ index ada7c1791aa..1ec60b2ffc9 100644
  namespace std _GLIBCXX_VISIBILITY(default)
  {
  _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -461,6 +466,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
+@@ -463,6 +468,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
      {
  #ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
        return __ch == L'/' || __ch == preferred_separator;
@@ -600,7 +519,7 @@ index ada7c1791aa..1ec60b2ffc9 100644
  #else
        return __ch == '/';
  #endif
-@@ -831,6 +838,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
+@@ -833,6 +840,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
  #ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
      std::replace(_M_pathname.begin(), _M_pathname.end(), L'/',
  		 preferred_separator);