# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1628933424 -7200
# Node ID bf01dad4e460d954c2291a3a10184d94c11b7c08
# Parent  6e2e867b421028d70ce0315d6c6ff563c7527e4c
GCC: Update to version 11.2.

* src/build-gcc.mk, src/native-gcc.mk: Update version and checksum.
* src/native-gcc-1-canadian-cross.patch: Add patch to fix Canadian cross
  compilation.
* dist-files.mk: Add new file to list.

diff -r 6e2e867b4210 -r bf01dad4e460 dist-files.mk
--- a/dist-files.mk	Thu Aug 12 14:44:31 2021 -0400
+++ b/dist-files.mk	Sat Aug 14 11:30:24 2021 +0200
@@ -454,6 +454,7 @@
   mxml-test.c \
   mxml.mk \
   native-binutils.mk \
+  native-gcc-1-canadian-cross.patch \
   native-gcc.mk \
   ncurses-1-gcc-5-fix.patch \
   ncurses.mk \
diff -r 6e2e867b4210 -r bf01dad4e460 src/build-gcc.mk
--- a/src/build-gcc.mk	Thu Aug 12 14:44:31 2021 -0400
+++ b/src/build-gcc.mk	Sat Aug 14 11:30:24 2021 +0200
@@ -3,8 +3,8 @@
 
 PKG             := build-gcc
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 10.2.0
-$(PKG)_CHECKSUM := 8de0aecd3a52bb92b43082df8a9256356d1f03be
+$(PKG)_VERSION  := 11.2.0
+$(PKG)_CHECKSUM := f902ccacecf8949978d6261e9f1d034cff73ffdb
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
diff -r 6e2e867b4210 -r bf01dad4e460 src/native-gcc-1-canadian-cross.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/native-gcc-1-canadian-cross.patch	Sat Aug 14 11:30:24 2021 +0200
@@ -0,0 +1,42 @@
+See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100017#c12
+
+diff --git a/libstdc++-v3/include/c_compatibility/fenv.h b/libstdc++-v3/include/c_compatibility/fenv.h
+index 0413e3b7c25..56cabaa3635 100644
+--- a/libstdc++-v3/include/c_compatibility/fenv.h
++++ b/libstdc++-v3/include/c_compatibility/fenv.h
+@@ -26,6 +26,10 @@
+  *  This is a Standard C++ Library header.
+  */
+ 
++#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
++# include_next <fenv.h>
++#else
++
+ #ifndef _GLIBCXX_FENV_H
+ #define _GLIBCXX_FENV_H 1
+ 
+@@ -83,3 +83,5 @@ namespace std
+ #endif // C++11
+ 
+ #endif // _GLIBCXX_FENV_H
++
++#endif // include_next
+
+diff --git a/libstdc++-v3/include/c_global/cfenv b/libstdc++-v3/include/c_global/cfenv
+index 0b0ec35a837..d24cb1a3c81 100644
+--- a/libstdc++-v3/include/c_global/cfenv
++++ b/libstdc++-v3/include/c_global/cfenv
+@@ -37,9 +37,11 @@
+ 
+ #include <bits/c++config.h>
+ 
+-#if _GLIBCXX_HAVE_FENV_H
+-# include <fenv.h>
+-#endif
++// Need to ensure this finds the C library's <fenv.h> not a libstdc++
++// wrapper that might already be installed later in the include search path.
++#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
++#include_next <fenv.h>
++#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
+ 
+ #ifdef _GLIBCXX_USE_C99_FENV_TR1
diff -r 6e2e867b4210 -r bf01dad4e460 src/native-gcc.mk
--- a/src/native-gcc.mk	Thu Aug 12 14:44:31 2021 -0400
+++ b/src/native-gcc.mk	Sat Aug 14 11:30:24 2021 +0200
@@ -3,8 +3,8 @@
 
 PKG             := native-gcc
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 10.2.0
-$(PKG)_CHECKSUM := 8de0aecd3a52bb92b43082df8a9256356d1f03be
+$(PKG)_VERSION  := 11.2.0
+$(PKG)_CHECKSUM := f902ccacecf8949978d6261e9f1d034cff73ffdb
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)