- updated to 9.5.0; more hacks to build with mingw32 5.4.x

[packages/crossmingw32-gcc.git] / gcc-mingw32.patch

--- gcc-8.5.0/libgfortran/intrinsics/chmod.c.orig	2021-05-14 10:42:10.000000000 +0200
+++ gcc-8.5.0/libgfortran/intrinsics/chmod.c	2022-02-16 06:22:37.688407716 +0100
@@ -28,6 +28,9 @@ see the files COPYING3 and COPYING.RUNTI
 #if defined(HAVE_SYS_STAT_H)
 
 #include <sys/stat.h>	/* For stat, chmod and umask.  */
+#ifdef __MINGW32__
+#include <io.h>
+#endif
 
 
 /* INTEGER FUNCTION CHMOD (NAME, MODE)
--- gcc-9.5.0/libstdc++-v3/libsupc++/new_opa.cc.orig	2023-04-15 22:04:10.903826873 +0200
+++ gcc-9.5.0/libstdc++-v3/libsupc++/new_opa.cc	2023-04-15 22:58:08.356288088 +0200
@@ -29,10 +29,13 @@
 #include <bit>
 #include "new"
 
-#if !_GLIBCXX_HAVE_ALIGNED_ALLOC && !_GLIBCXX_HAVE__ALIGNED_MALLOC \
-  && !_GLIBCXX_HAVE_POSIX_MEMALIGN && _GLIBCXX_HAVE_MEMALIGN
+#if !_GLIBCXX_HAVE_ALIGNED_ALLOC && (!_GLIBCXX_HAVE__ALIGNED_MALLOC || defined(__MINGW32__)) \
+  && !_GLIBCXX_HAVE_POSIX_MEMALIGN && (_GLIBCXX_HAVE_MEMALIGN || defined(__MINGW32__))
 # if _GLIBCXX_HOSTED && __has_include(<malloc.h>)
 // Some C libraries declare memalign in <malloc.h>
+#  ifdef __MINGW32__
+#    define __MSVCRT_VERSION__ 0x0700
+#  endif
 #  include <malloc.h>
 # else
 extern "C" void *memalign(std::size_t boundary, std::size_t size);
--- gcc-7.5.0/libstdc++-v3/libsupc++/del_opa.cc.orig	2017-01-26 15:30:45.014860000 +0100
+++ gcc-7.5.0/libstdc++-v3/libsupc++/del_opa.cc	2019-12-26 09:41:01.210155799 +0100
@@ -40,6 +40,16 @@
 
 #include "new"
 
+#if !_GLIBCXX_HAVE_ALIGNED_ALLOC && (!_GLIBCXX_HAVE__ALIGNED_MALLOC || defined(__MINGW32__)) \
+  && !_GLIBCXX_HAVE_POSIX_MEMALIGN && (_GLIBCXX_HAVE_MEMALIGN || defined(__MINGW32__))
+# if _GLIBCXX_HOSTED && __has_include(<malloc.h>)
+#  ifdef __MINGW32__
+#    define __MSVCRT_VERSION__ 0x0700
+#  endif
+#  include <malloc.h>
+# endif
+#endif
+
 // The sized deletes are defined in other files.
 #pragma GCC diagnostic ignored "-Wsized-deallocation"
 
--- gcc-9.5.0/libstdc++-v3/src/filesystem/ops-common.h.orig	2022-05-27 09:21:13.451391769 +0200
+++ gcc-9.5.0/libstdc++-v3/src/filesystem/ops-common.h	2023-04-16 15:41:54.130017065 +0200
@@ -106,7 +106,7 @@ namespace __gnu_posix
   inline int rename(const wchar_t* oldname, const wchar_t* newname)
   { return _wrename(oldname, newname); }
 
-  inline int truncate(const wchar_t* path, _off64_t length)
+  inline int truncate(const wchar_t* path, __off64_t length)
   {
     const int fd = ::_wopen(path, _O_BINARY|_O_RDWR);
     if (fd == -1)
--- gcc-9.5.0/libstdc++-v3/config/os/mingw32/error_constants.h.orig	2022-05-27 09:21:13.331391181 +0200
+++ gcc-9.5.0/libstdc++-v3/config/os/mingw32/error_constants.h	2023-04-16 18:55:43.337016242 +0200
@@ -33,6 +33,18 @@
 #include <bits/c++config.h>
 #include <cerrno>
 
+#ifndef EOVERFLOW
+#define EOVERFLOW ERANGE
+#endif
+
+#ifndef ELOOP
+#define ELOOP ERANGE
+#endif
+
+#ifndef ENOTSUP
+#define ENOTSUP ENOSYS
+#endif
+
 namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
--- gcc-9.5.0/libstdc++-v3/src/c++11/system_error.cc.orig	2022-05-27 09:21:13.447391751 +0200
+++ gcc-9.5.0/libstdc++-v3/src/c++11/system_error.cc	2023-04-16 20:09:05.676500055 +0200
@@ -168,7 +168,7 @@ namespace
 #ifdef EISDIR
       case EISDIR:
 #endif
-#ifdef ELOOP
+#if defined(ELOOP) && (ELOOP != ERANGE)
       case ELOOP:
 #endif
 #ifdef EMFILE
@@ -253,7 +253,7 @@ namespace
 #ifdef ENOTSOCK
       case ENOTSOCK:
 #endif
-#ifdef ENOTSUP
+#if defined (ENOTSUP) && (ENOTSUP != ENOSYS)
       case ENOTSUP:
 #endif
 #ifdef ENOTTY
@@ -265,7 +265,7 @@ namespace
 #if defined EOPNOTSUPP && (!defined ENOTSUP || EOPNOTSUPP != ENOTSUP)
       case EOPNOTSUPP:
 #endif
-#ifdef EOVERFLOW
+#if defined(EOVERFLOW) && (EOVERFLOW != ERANGE)
       case EOVERFLOW:
 #endif
 #ifdef EOWNERDEAD