10 files changed, 23 insertions, 17 deletions
diff --git a/config/arch/mips.in.2 b/config/arch/mips.in.2
index ee0424d..35c60e0 100644
--- a/config/arch/mips.in.2
+++ b/config/arch/mips.in.2
@@ -7,7 +7,7 @@ choice
 config ARCH_mips_o32
     bool
     prompt "o32"
-    depends on ARCH_32
+    depends on (ARCH_32 || MULTILIB)
     help
       This is the -mabi=32 gcc option.
 
diff --git a/config/arch/sh.in b/config/arch/sh.in
index 68d3120..60de313 100644
--- a/config/arch/sh.in
+++ b/config/arch/sh.in
@@ -5,6 +5,7 @@
 ## select ARCH_USE_MMU
 ## select ARCH_SUPPORTS_BOTH_ENDIAN
 ## select ARCH_DEFAULT_LE
+## select ARCH_REQUIRES_MULTILIB
 ##
 ## help The Super-H architecture, as defined by:
 ## help     http://www.renesas.com/fmwk.jsp?cnt=superh_family_landing.jsp&fp=/products/mpumcu/superh_family/
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 2df2058..1fcdb72 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -226,7 +226,7 @@ config CC_GCC_HAS_LNK_HASH_STYLE
     bool
 
 # Only enable gcc's support for plugins if binutils has it as well
-# They are usefull only when doing LTO, but it does no harm enabling
+# They are useful only when doing LTO, but it does no harm enabling
 # them even without LTO.
 config CC_GCC_ENABLE_PLUGINS
     bool
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index 17b41cc..c200d22 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -37,6 +37,16 @@ config CC_GCC_EXTRA_CONFIG_ARRAY
       if they are properly quoted (or escaped, but prefer quotes). Eg.:
           --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
 
+config CC_GCC_MULTILIB_LIST
+    string
+    prompt "List of multilib variants"
+    depends on MULTILIB
+    help
+      Architecture-specific option of expanding or restricting the list of
+      the multilib variants to be built. Refer to GCC installation manual
+      for the format of this option for a particular architecture.
+      Leave empty to use the default list for this architecture.
+
 config CC_GCC_TARGET_FINAL
     bool
     prompt "Use the default targets all and install for the final compiler"
diff --git a/config/debug/gdb.in.cross b/config/debug/gdb.in.cross
index 07b85b8..fb993c9 100644
--- a/config/debug/gdb.in.cross
+++ b/config/debug/gdb.in.cross
@@ -21,7 +21,7 @@ config GDB_CROSS_STATIC
     depends on CONFIGURE_has_static_link
     select WANTS_STATIC_LINK
     help
-      A static cross gdb can be usefull if you debug on a machine that is
+      A static cross gdb can be useful if you debug on a machine that is
       not the one that is used to compile the toolchain.
       
       That way, you can share the cross-gdb without installing a toolchain
diff --git a/config/libc/glibc.in.2 b/config/libc/glibc.in.2
index 346f9b7..104552a 100644
--- a/config/libc/glibc.in.2
+++ b/config/libc/glibc.in.2
@@ -55,16 +55,6 @@ config LIBC_GLIBC_EXTRA_CFLAGS
     help
       Extra target CFLAGS to use when building.
 
-config LIBC_EXTRA_CC_ARGS
-    string
-    prompt "gcc extra flags"
-    default ""
-    help
-      Extra flags to pass gcc when building.
-
-      Seldom used, except for sparc64 which seems to need the flag -64
-      to be passed onto gcc.
-
 config LIBC_ENABLE_FORTIFIED_BUILD
     bool
     prompt "Enable fortified build (EXPERIMENTAL)"
diff --git a/config/libc/musl.in b/config/libc/musl.in
index 00d98ea..ff84448 100644
--- a/config/libc/musl.in
+++ b/config/libc/musl.in
@@ -1,6 +1,7 @@
 # musl options
 
 ## depends on ! WINDOWS && ! BARE_METAL
+## depends on EXPERIMENTAL
 ##
 ## select LIBC_SUPPORT_THREADS_NATIVE
 ## select CC_CORE_PASSES_NEEDED
diff --git a/config/libc/none.in b/config/libc/none.in
index d587faf..b8860b0 100644
--- a/config/libc/none.in
+++ b/config/libc/none.in
@@ -4,10 +4,10 @@
 ##
 ## help Do not use a C library.
 ## help
-## help This is usefull if your project is self-contained, does not rely on
+## help This is useful if your project is self-contained, does not rely on
 ## help an external C library, and provides all the necessary bits.
 ## help
-## help Most probably usefull to bootloaders, as they generally don't depend
+## help Most probably useful to bootloaders, as they generally don't depend
 ## help on the C library.
 ## help
 ## help If unsure: do *not* choose that, and use another option in the choice.
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index 989da7b..a99ff73 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -129,13 +129,13 @@ config LIBC_UCLIBC_VERBOSITY_0
 
 config LIBC_UCLIBC_VERBOSITY_1
     bool
-    prompt "Brief build (show defines, ld flags)"
+    prompt "Very verbose build"
     help
       Print simplified command lines.
 
 config LIBC_UCLIBC_VERBOSITY_2
     bool
-    prompt "Very verbose build"
+    prompt "Brief build (show defines, ld flags)"
     help
       Print full command lines.
 
diff --git a/config/target.in b/config/target.in
index 8cbaabc..e8f0fe7 100644
--- a/config/target.in
+++ b/config/target.in
@@ -65,9 +65,13 @@ config ARCH_REQUIRES_MULTILIB
     bool
     select MULTILIB
 
+# Multilib requires 1st core pass (i.e., pass without building libgcc)
+# to determine which target cflags vary with multilib and which must be
+# passed from the arch configuration.
 config MULTILIB
     bool
     prompt "Build a multilib toolchain (READ HELP!!!)"
+    select CC_CORE_PASS_1_NEEDED
     help
       If you say 'y' here, then the toolchain will also contain the C library
       optimised for some variants of the selected architecture, besides the