Merge branch 'master' of https://github.com/crosstool-ng/crosstool-ng

10 files changed, 42 insertions, 25 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/binutils/binutils.in.2 b/config/binutils/binutils.in.2
index 3dafb0f..336098b 100644
--- a/config/binutils/binutils.in.2
+++ b/config/binutils/binutils.in.2
@@ -29,7 +29,7 @@ if ELF2FLT_GIT
 config ELF2FLT_GIT_CSET
     string
     prompt "git cset"
-    default "454b6b415a31959661406bdfbd9dad22229367bf"
+    default "9dbc458c6122c495bbdec8dc975a15c9d39e5ff2"
     help
       Enter the git changeset to use.
 
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 2df2058..101f2b2 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -71,10 +71,14 @@ choice
 
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
+config CC_GCC_V_6_1_0
+    bool
+    prompt "6.1.0"
+    select CC_GCC_6
 
-config CC_GCC_V_5_3_0
+config CC_GCC_V_5_4_0
     bool
-    prompt "5.3.0"
+    prompt "5.4.0"
     select CC_GCC_5
 
 config CC_GCC_V_linaro_5_2
@@ -162,10 +166,27 @@ config CC_GCC_5_or_later
     bool
     select CC_GCC_4_9_or_later
 
+config CC_GCC_6
+    bool
+    select CC_GCC_6_or_later
+    select CC_GCC_USE_GMP_MPFR
+    select CC_GCC_USE_MPC
+    select CC_GCC_HAS_GRAPHITE
+    select CC_GCC_HAS_LTO
+    select CC_GCC_HAS_PKGVERSION_BUGURL
+    select CC_GCC_HAS_BUILD_ID
+    select CC_GCC_HAS_LNK_HASH_STYLE
+    select CC_GCC_HAS_LIBQUADMATH
+    select CC_GCC_HAS_LIBSANITIZER
+    select CC_SUPPORT_GOLANG
+
+config CC_GCC_6_or_later
+    bool
+    select CC_GCC_5_or_later
 
 config CC_GCC_latest
     bool
-    select CC_GCC_5_or_later
+    select CC_GCC_6_or_later
     select CC_GCC_USE_GMP_MPFR
     select CC_GCC_USE_MPC
     select CC_GCC_HAS_GRAPHITE
@@ -226,7 +247,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
@@ -261,7 +282,8 @@ config CC_GCC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
-    default "5.3.0" if CC_GCC_V_5_3_0
+    default "6.1.0" if CC_GCC_V_6_1_0
+    default "5.4.0" if CC_GCC_V_5_4_0
     default "linaro-5.2-2015.11-2" if CC_GCC_V_linaro_5_2
     default "linaro-4.9-2015.06" if CC_GCC_V_linaro_4_9
     default "4.9.3" if CC_GCC_V_4_9_3
diff --git a/config/debug/duma.in b/config/debug/duma.in
index 374339d..35f9e09 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -14,7 +14,8 @@ config DUMA_A
 config DUMA_SO
     bool
     prompt "Build a shared library"
-    default y if SHARED_LIBS
+    depends on SHARED_LIBS
+    default y
 
 choice
     bool
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 ff84448..3e0b5a1 100644
--- a/config/libc/musl.in
+++ b/config/libc/musl.in
@@ -55,7 +55,7 @@ choice
 
 config LIBC_MUSL_V_1_1
     bool
-    prompt "1.1.14 (Mainline)"
+    prompt "1.1.15 (Mainline)"
     depends on EXPERIMENTAL
 
 endchoice
@@ -64,6 +64,6 @@ config LIBC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
-    default "1.1.14" if LIBC_MUSL_V_1_1
+    default "1.1.15" if LIBC_MUSL_V_1_1
 
 endif # ! LIBC_MUSL_CUSTOM
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