some fixes

3 files changed, 9 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85e0f3ca164e..fb20657cde25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dosbox-gcc
 	pkgdesc = djgpp cross-compiler for the dosbox environment
-	pkgver = 12.2.0
-	pkgrel = 2
+	pkgver = 13.1.0
+	pkgrel = 1
 	url = http://gcc.gnu.org
 	arch = i686
 	arch = x86_64
@@ -18,12 +18,12 @@ pkgbase = dosbox-gcc
 	depends = libmpc
 	depends = dosbox-binutils
 	optdepends = dosbox-djcrx: headers and utilities
-	noextract = gcc-12.2.0.tar.xz
+	noextract = gcc-13.1.0.tar.xz
 	noextract = djcrx205.zip
 	options = !strip
 	options = staticlibs
 	options = !emptydirs
-	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 = ftp://www.delorie.com/pub/djgpp/current/v2/djcrx205.zip
 	source = gcc-djgpp.diff
 	source = lto.patch
diff --git a/PKGBUILD b/PKGBUILD
index cd8da6e3483a..10bf6257183e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 # Contributor: janezz55
 
 pkgname=dosbox-gcc
-pkgver=12.2.0
+pkgver=13.1.0
 _target="i586-pc-msdosdjgpp"
 _djver=2.05
-pkgrel=2
+pkgrel=1
 pkgdesc="djgpp cross-compiler for the dosbox environment"
 arch=('i686' 'x86_64')
 url="http://gcc.gnu.org"
@@ -92,6 +92,9 @@ build() {
   ac_cv_lib_dl_dlopen=no \
   ac_cv_lib_svld_dlopen=no \
   ac_cv_lib_dld_dld_link=no \
+  enable_c99=yes \
+  glibcxx_cv_c99_math_cxx98=yes \
+  glibcxx_cv_c99_math_cxx11=yes \
   make all
 }
 
diff --git a/gcc-djgpp.diff b/gcc-djgpp.diff
index 991e740c80d4..0176b7b9f27b 100644
--- a/gcc-djgpp.diff
+++ b/gcc-djgpp.diff
@@ -107,19 +107,6 @@ 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
---- 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
- 	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 >$@
- 
- 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
 --- a/gcc/ada/libgnarl/s-taprop__dummy.adb
@@ -939,38 +926,3 @@ index 19d246100cb..1463a59b45a 100644
      return has_root_name() && has_root_directory();
  #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
---- 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)
-   get_mutex(unsigned char i)
-   {
-     // 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];
-   }
-diff --git a/libstdc++-v3/src/filesystem/path.cc b/libstdc++-v3/src/filesystem/path.cc
-index cb8d2c67941..186f86401cb 100644
---- a/libstdc++-v3/src/filesystem/path.cc
-+++ b/libstdc++-v3/src/filesystem/path.cc
-@@ -411,8 +411,13 @@ path::_M_split_cmpts()
- 	_M_add_root_dir(0);
-       ++pos;
-     }
--#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-+#if defined(_GLIBCXX_FILESYSTEM_IS_WINDOWS) \
-+  || defined(_GLIBCXX_FILESYSTEM_IS_DJGPP)
-+#ifdef __DJGPP__
-+  else if (len > 1 && pathname[1] == ':')
-+#else
-   else if (len > 1 && pathname[1] == L':')
-+#endif
-     {
-       // got disk designator
-       if (len == 2)