Update to gcc suite version 1.9.0 with gcc 11.1refs/changes/04/15504/1

Change-Id: I9db0d491009f095293b09071be0250185c96b3b5

3 files changed, 59 insertions, 29 deletions

diff --git a/PATCHES/0006-Windows-New-feature-to-allow-overriding.patch b/PATCHES/0006-Windows-New-feature-to-allow-overriding.patch
index 9899224..432fa18 100644
--- a/PATCHES/0006-Windows-New-feature-to-allow-overriding.patch
+++ b/PATCHES/0006-Windows-New-feature-to-allow-overriding.patch
@@ -1,22 +1,7 @@
-From d8cd8d0211dcd606a3753a6b3c36c19a7b1672dc Mon Sep 17 00:00:00 2001
-From: Ray Donnelly <mingw.android@gmail.com>
-Date: Wed, 5 Aug 2015 23:36:13 +0100
-Subject: [PATCH 05/19] master Windows: New feature to allow overriding
- -lmsvcrt
-
-Added in support of the MinGW-w64 WIP feature "agile mscvrt dll" where
-a process' loaded msvc runtime is used by a newly loaded DLL rather than
-always using msvcrt.dll
----
- gcc/config/i386/cygming.opt | 3 +++
- gcc/config/i386/mingw32.h   | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config/i386/cygming.opt b/gcc/config/i386/cygming.opt
-index a9074bf..e1d89e2 100644
---- a/gcc/config/i386/cygming.opt
-+++ b/gcc/config/i386/cygming.opt
-@@ -22,6 +22,9 @@ mconsole
+diff -ruNb gcc-11.1.0.orig/gcc/config/i386/cygming.opt gcc-11.1.0/gcc/config/i386/cygming.opt
+--- gcc-11.1.0.orig/gcc/config/i386/cygming.opt	2021-04-27 12:00:13.000000000 +0200
++++ gcc-11.1.0/gcc/config/i386/cygming.opt	2021-04-28 14:37:45.671358493 +0200
+@@ -22,6 +22,9 @@
  Target RejectNegative
  Create console application.
  
@@ -26,19 +11,15 @@ index a9074bf..e1d89e2 100644
  mdll
  Target RejectNegative
  Generate code for a DLL.
-diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
-index 4ac5f68..f875e7b 100644
---- a/gcc/config/i386/mingw32.h
-+++ b/gcc/config/i386/mingw32.h
-@@ -140,7 +140,7 @@ along with GCC; see the file COPYING3.  If not see
+diff -ruNb gcc-11.1.0.orig/gcc/config/i386/mingw32.h gcc-11.1.0/gcc/config/i386/mingw32.h
+--- gcc-11.1.0.orig/gcc/config/i386/mingw32.h	2021-04-27 12:00:13.000000000 +0200
++++ gcc-11.1.0/gcc/config/i386/mingw32.h	2021-04-28 14:38:47.999199541 +0200
+@@ -177,7 +177,7 @@
  #define REAL_LIBGCC_SPEC \
    "%{mthreads:-lmingwthrd} -lmingw32 \
     " SHARED_LIBGCC_SPEC " \
--   -lmoldname -lmingwex -lmsvcrt"
-+   -lmoldname -lmingwex %{!mcrtdll=*:-lmsvcrt} %{mcrtdll=*:-l%*}"
+-   -lmoldname -lmingwex -lmsvcrt -lkernel32"
++   -lmoldname -lmingwex %{!mcrtdll=*:-lmsvcrt} %{mcrtdll=*:-l%*} -lkernel32"
  
  #undef STARTFILE_SPEC
  #define STARTFILE_SPEC "%{shared|mdll:dllcrt2%O%s} \
--- 
-2.7.1
-
diff --git a/PATCHES/0025-crt-Undefine-__rdtsc-for-GCC-11.patch b/PATCHES/0025-crt-Undefine-__rdtsc-for-GCC-11.patch
new file mode 100644
index 0000000..8fd1dcc
--- /dev/null
+++ b/PATCHES/0025-crt-Undefine-__rdtsc-for-GCC-11.patch
@@ -0,0 +1,27 @@
+From f3e91c4d4fded83dfbced83a9449c5756d3448da Mon Sep 17 00:00:00 2001
+From: Liu Hao <lh_mouse@126.com>
+Date: Sat, 10 Apr 2021 20:05:36 +0800
+Subject: [PATCH] crt: Undefine `__rdtsc` for GCC 11
+
+Signed-off-by: Liu Hao <lh_mouse@126.com>
+---
+ mingw-w64-crt/intrincs/rdtsc.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/mingw-w64-crt/intrincs/rdtsc.c b/mingw-w64-crt/intrincs/rdtsc.c
+index bf9c03b34..55a31a982 100644
+--- a/mingw-w64-crt/intrincs/rdtsc.c
++++ b/mingw-w64-crt/intrincs/rdtsc.c
+@@ -6,6 +6,9 @@
+ 
+ #include <intrin.h>
+ 
++/* GCC 11 has this as a macro.  */
++#undef __rdtsc
++
+ /* Clang has support for MSVC builtins, GCC doesn't */
+ #ifndef __has_builtin
+   #define __has_builtin(x) 0
+-- 
+2.25.1
+
diff --git a/PATCHES/0025-gcc11_1_0_quick_exit.patch b/PATCHES/0025-gcc11_1_0_quick_exit.patch
new file mode 100644
index 0000000..c3585b3
--- /dev/null
+++ b/PATCHES/0025-gcc11_1_0_quick_exit.patch
@@ -0,0 +1,22 @@
+--- a/mingw-w64-headers/crt/stdlib.h
++++ b/mingw-w64-headers/crt/stdlib.h
+@@ -387,6 +387,9 @@
+ #define _CRT_TERMINATE_DEFINED
+   void __cdecl __MINGW_NOTHROW exit(int _Code) __MINGW_ATTRIB_NORETURN;
+   void __cdecl __MINGW_NOTHROW _exit(int _Code) __MINGW_ATTRIB_NORETURN;
++#ifdef _UCRT
++  void __cdecl __MINGW_NOTHROW quick_exit(int _Code) __MINGW_ATTRIB_NORETURN;
++#endif
+
+ #if !defined __NO_ISOCEXT /* extern stub in static libmingwex.a */
+   /* C99 function name */
+@@ -420,6 +423,9 @@
+ #endif
+
+   int __cdecl atexit(void (__cdecl *)(void));
++#ifdef _UCRT
++  int __cdecl at_quick_exit(void (__cdecl *)(void));
++#endif
+ #ifndef _CRT_ATOF_DEFINED
+ #define _CRT_ATOF_DEFINED
+   double __cdecl atof(const char *_String);