From 86062515858aefe5f1f66b2a315aafa458999ede Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Tue, 3 Mar 2020 16:37:31 -0800
Subject: Add --with-cpu= on 32-bit SPARC

... if building for GLIBC 2.31+.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 config/libc/glibc.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index c7533593..f891392d 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -35,11 +35,13 @@ config GLIBC_DEP_BINUTILS
     select BINUTILS_REQUIRE_2_25_or_later if GLIBC_2_26_or_later
     select BINUTILS_REQUIRE_older_than_2_30 if GLIBC_older_than_2_26 && ARCH_ARM && ARCH_64
 
+# Glibc 2.26 requires GCC4.9 or newer
 # Glibc 2.29 requires GCC5+ or, for ppc64le, GCC6.2+. We only support the latest
 # release on GCC6 branch, so just assume it is newer than 6.2
 # Glibc 2.30 uncondtionally requires GCC 6.2+
 config GLIBC_DEP_GCC
     def_bool y
+    select GCC_REQUIRE_4_9_or_later if GLIBC_2_26_or_later
     select GCC_REQUIRE_5_or_later if GLIBC_2_29_or_later
     select GCC_REQUIRE_6_or_later if GLIBC_2_29_or_later && ARCH_POWERPC && ARCH_64 && ARCH_LE
     select GCC_REQUIRE_6_or_later if GLIBC_2_30_or_later
@@ -64,9 +66,11 @@ config GLIBC_DEP_MAKE_4_0
     select MAKE_REQUIRE_4_0_or_later
     select MAKE_GNUMAKE_SYMLINK # Override old host make in .build/tools/bin
 
-config GLIBC_DEP_GCC
+# Glibc 2.31 removed support for pre-v8 SPARC in 32-bit mode (64-bit mode always
+# required UltraSPARC)
+config GLIBC_SPARC_ALLOW_V7
     def_bool y
-    select GCC_REQUIRE_4_9_or_later if GLIBC_2_26_or_later
+    depends on GLIBC_2_30_or_older
 
 config THREADS
     default "nptl"
-- 
cgit v1.2.3


From 29422b2eda308526cd568507109b0a222eb09449 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 4 Mar 2020 11:41:04 -0800
Subject: Disallow PPS SPE ABI

with GCC 9+ and GLIBC 2.30+, they no longer support it.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 config/arch/powerpc.in    | 4 ++++
 packages/gcc/package.desc | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/arch/powerpc.in b/config/arch/powerpc.in
index 83f0f77b..73cdf757 100644
--- a/config/arch/powerpc.in
+++ b/config/arch/powerpc.in
@@ -43,6 +43,8 @@ config ARCH_powerpc_ABI_EABI
 config ARCH_powerpc_ABI_SPE
     bool
     prompt "SPE"
+    select GCC_REQUIRE_8_or_older
+    select GLIBC_REQUIRE_2_29_or_older
     help
       Add support for the Signal Processing Engine.  This will set up
       the toolchain so that it supports the SPE ABI extensions. This
@@ -55,4 +57,6 @@ config ARCH_powerpc_ABI_SPE
       and "--enable-e500_double" to your CC_EXTRA_CONFIG_ARRAY, so you
       do not need to explicitly add them.
 
+      Support for SPE ABI has been removed in GCC 9.
+
 endchoice
diff --git a/packages/gcc/package.desc b/packages/gcc/package.desc
index e6d98f88..a37f0c58 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'
+milestones='4.8 4.9 5 6 7 8'
 archive_formats='.tar.xz .tar.gz'
-- 
cgit v1.2.3