8 files changed, 39 insertions, 3 deletions
diff --git a/config/arch/powerpc.in b/config/arch/powerpc.in
index 40d88b91..73cdf757 100644
--- a/config/arch/powerpc.in
+++ b/config/arch/powerpc.in
@@ -11,6 +11,7 @@
 ## select ARCH_SUPPORTS_WITH_CPU
 ## select ARCH_SUPPORTS_WITH_TUNE
 ## select ARCH_SUPPORTS_WITH_FLOAT
+## select ARCH_SUPPORTS_WITH_32_64
 ##
 ## help The PowerPC architecture, as defined by:
 ## help     http://www.ibm.com/developerworks/eserver/articles/archguide.html
@@ -42,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
@@ -54,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/config/arch/sparc.in b/config/arch/sparc.in
index 1b4abcca..fe46eaae 100644
--- a/config/arch/sparc.in
+++ b/config/arch/sparc.in
@@ -10,6 +10,7 @@
 ## select ARCH_SUPPORTS_WITH_CPU
 ## select ARCH_SUPPORTS_WITH_TUNE
 ## select ARCH_SUPPORTS_WITH_FLOAT
+## select ARCH_SUPPORTS_WITH_32_64 if GCC_6_or_later
 ##
 ## help The SUN SPARC architecture, as defined by:
 ## help     32 bit: http://www.sparc.org/standards/V8.pdf
diff --git a/config/arch/x86.in b/config/arch/x86.in
index ab89ccda..ec166557 100644
--- a/config/arch/x86.in
+++ b/config/arch/x86.in
@@ -8,6 +8,7 @@
 ## select ARCH_SUPPORTS_WITH_ARCH
 ## select ARCH_SUPPORTS_WITH_CPU
 ## select ARCH_SUPPORTS_WITH_TUNE
+## select ARCH_SUPPORTS_WITH_32_64
 ##
 ## help The x86 architecture, as defined by:
 ## help     32-bit (ia32) : http://www.intel.com/
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 928659af..a92dec98 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -156,6 +156,15 @@ config BINUTILS_RELRO
       Setting this option to 'M' configures binutils with their internal
       default for the selected architecture.
 
+config BINUTILS_DETERMINISTIC_ARCHIVES
+    bool
+    prompt "Enable deterministic archives by default" if BINUTILS_2_23_or_later
+    default y if BINUTILS_2_23_or_later
+    help
+      Setting this option will enable deterministic mode by default (-D).
+      ar and ranlib will use zero for UIDs, GIDs,
+      timestamps, and use consistent file modes for all files.
+
 config BINUTILS_EXTRA_CONFIG_ARRAY
     string
     prompt "binutils extra config"
@@ -206,7 +215,7 @@ config ELF2FLT_EXTRA_CONFIG_ARRAY
     default ""
     help
       Extra flags passed onto ./configure when configuring
-      
+
       You can enter multiple arguments here, and arguments can contain spaces
       if they are properly quoted (or escaped, but prefer quotes). Eg.:
           --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
diff --git a/config/global/paths.in b/config/global/paths.in
index 0bf43d95..82ee4b39 100644
--- a/config/global/paths.in
+++ b/config/global/paths.in
@@ -55,6 +55,10 @@ config BUILD_TOP_DIR
     string
     default "${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
 
+config BUILD_DIR
+    string
+    default "${CT_BUILD_TOP_DIR}/build"
+
 config PREFIX_DIR
     string
     prompt "Prefix directory"
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"
diff --git a/config/libc/newlib.in b/config/libc/newlib.in
index 268f9564..199eff2a 100644
--- a/config/libc/newlib.in
+++ b/config/libc/newlib.in
@@ -152,6 +152,13 @@ config LIBC_NEWLIB_MULTITHREAD
     help
         Enable support for multiple threads.
 
+config LIBC_NEWLIB_RETARGETABLE_LOCKING
+    bool
+    prompt "Enable retargetable locking"
+    help
+        Enable retargetable locking to allow the operating system to override
+        the dummy lock functions defined within the newlib.
+
 config LIBC_NEWLIB_EXTRA_SECTIONS
     bool
     prompt "Place each function & data element in their own section"
diff --git a/config/target.in b/config/target.in
index 8549c5b8..995457a0 100644
--- a/config/target.in
+++ b/config/target.in
@@ -236,6 +236,11 @@ config ARCH_64
 
 endchoice
 
+# Whether this architecture supports passing --with-{cpu,arch,tune}-{32,64}=
+# to GCC configure.
+config ARCH_SUPPORTS_WITH_32_64
+    bool
+
 #--------------------------------------
 comment "Target optimisations"