3 files changed, 7 insertions, 5 deletions
diff --git a/config/arch/alpha.in b/config/arch/alpha.in
index e46772dc..c5d76e46 100644
--- a/config/arch/alpha.in
+++ b/config/arch/alpha.in
@@ -1,8 +1,8 @@
 # Alpha specific configuration file
 
 ## no-package
-## select ARCH_SUPPORTS_32
-## select ARCH_DEFAULT_32
+## select ARCH_SUPPORTS_64
+## select ARCH_DEFAULT_64
 ## select ARCH_USE_MMU
 ## select ARCH_SUPPORTS_WITH_CPU
 ## select ARCH_SUPPORTS_WITH_TUNE
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index c3918e8a..01d72536 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -84,6 +84,7 @@ config CC_GCC_EXTRA_CONFIG_ARRAY
 config CC_GCC_MULTILIB_LIST
     string "List of multilib variants"
     depends on MULTILIB
+    default "m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single" if GCC_V_11 && ARCH_SH
     help
       Architecture-specific option of expanding or restricting the list of
       the multilib variants to be built. Refer to GCC installation manual
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 001cd2f1..5a3b1b8c 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -150,7 +150,7 @@ config GLIBC_NO_SPARC_V8
 # The option and the code has finally been removed in 2.32
 config GLIBC_HAS_OBSOLETE_RPC
     def_bool y
-    depends on GLIBC_2_14_or_later && !CT_GLIBC_2_32_or_later
+    depends on GLIBC_2_14_or_later && !GLIBC_2_32_or_later
 
 config GLIBC_EXTRA_CONFIG_ARRAY
     string
@@ -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