From 6ca5f91fb59bb77a942e1287a6fcfec7811ffa36 Mon Sep 17 00:00:00 2001
From: spaun2002 <spaun2002mobile@gmail.com>
Date: Wed, 28 Apr 2021 20:15:27 -0700
Subject: Disable -Werror for GLIBC for all ARCH for GCC11.

This change replicates what GLIBC 2.23 has in the string/rawmemchr.c:

// #if __GNUC_PREREQ (11, 0)
//  /* Likewise GCC 11, with a different warning option.  */
//  DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overread");
// #endif

With -Werror multiple platforms failing on the string/rawmemchr.c:40 line.

Signed-off-by: Nik Konyuchenko <spaun2002mobile@gmail.com>

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 001cd2f..e89ed8c 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -403,8 +403,9 @@ config GLIBC_SSP
 # GCC8-related fixes were only available in glibc 2.27.
 config GLIBC_ENABLE_WERROR
     bool "Enable -Werror during the build"
-    depends on !(ARCH_POWERPC && ARCH_64 && GLIBC_V_2_32)
-    depends on !(ARCH_SPARC && GLIBC_V_2_32)
+    default n if GLIBC_2_32_or_later && ARCH_POWERPC && ARCH_64
+    default n if GLIBC_2_32_or_later && ARCH_SPARC
+    default n if GLIBC_2_32_or_later && GCC_11_or_later
     default y if GCC_7_or_older
     default y if GCC_8_or_later && GLIBC_2_27_or_later
     help
diff --git a/packages/gcc/package.desc b/packages/gcc/package.desc
index a37f0c5..0ee344e 100644
--- a/packages/gcc/package.desc
+++ b/packages/gcc/package.desc
@@ -2,5 +2,5 @@ repository='svn svn://gcc.gnu.org/svn/gcc'
 mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})'
 relevantpattern='4.*|. *|.'
 origin='GNU'
-milestones='4.8 4.9 5 6 7 8'
+milestones='4.8 4.9 5 6 7 8 11'
 archive_formats='.tar.xz .tar.gz'
-- 
cgit v0.10.2-6-g49f6