From 1659d25e0f85e445ae7efc703bbdede0fdce801e Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 12 Jul 2017 00:15:56 -0700
Subject: Fix HAS_LIBMPX selection

Was previously selected by GCC_5_or_later - but now that one is an
auto-generated option that does not select anything; now HAS_LIBMPX
was made dependent on GCC_5_or_later, but its default was not set to y.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index f501757..1deb92d 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -31,10 +31,9 @@ source "config/versions/gcc.in"
 # They are useful only when doing LTO, but it does no harm enabling
 # them even without LTO.
 config CC_GCC_ENABLE_PLUGINS
-    bool
+    def_bool y
     depends on BINUTILS_PLUGINS
     depends on ! STATIC_TOOLCHAIN
-    default y
 
 # Affects the build of musl
 config GCC_BUG_61144
@@ -43,22 +42,19 @@ config GCC_BUG_61144
 
 # If binutils installs gold, enable support for gold in gcc
 config CC_GCC_GOLD
-    bool
+    def_bool y
     depends on BINUTILS_GOLD_INSTALLED
-    default y
 
 config CC_GCC_HAS_LIBMPX
+    def_bool y
     depends on GCC_5_or_later
-    bool
 
 config CC_LANG_JAVA_USE_ECJ
-    bool
-    default y
+    def_bool y
     depends on CC_LANG_JAVA
 
 config CC_GCC_ENABLE_CXX_FLAGS
-    string
-    prompt "Flags to pass to --enable-cxx-flags"
+    string "Flags to pass to --enable-cxx-flags"
     default ""
     help
       Enter here the value of the gcc's ./configure option --enable-cxx-flags.
@@ -68,8 +64,7 @@ config CC_GCC_ENABLE_CXX_FLAGS
       after the '=' sign.
 
 config CC_GCC_CORE_EXTRA_CONFIG_ARRAY
-    string
-    prompt "Core gcc extra config"
+    string "Core gcc extra config"
     default ""
     depends on CC_CORE_PASS_1_NEEDED || CC_CORE_PASS_2_NEEDED
     help
@@ -83,8 +78,7 @@ config CC_GCC_CORE_EXTRA_CONFIG_ARRAY
           --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
 
 config CC_GCC_EXTRA_CONFIG_ARRAY
-    string
-    prompt "gcc extra config"
+    string "gcc extra config"
     default ""
     help
       Extra flags to pass onto ./configure when configuring gcc.
@@ -94,8 +88,7 @@ config CC_GCC_EXTRA_CONFIG_ARRAY
           --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
 
 config CC_GCC_MULTILIB_LIST
-    string
-    prompt "List of multilib variants"
+    string "List of multilib variants"
     depends on MULTILIB
     help
       Architecture-specific option of expanding or restricting the list of
@@ -108,8 +101,7 @@ config STATIC_TOOLCHAIN
     select CC_GCC_STATIC_LIBSTDCXX
 
 config CC_GCC_STATIC_LIBSTDCXX
-    bool
-    prompt "Link libstdc++ statically into the gcc binary"
+    bool "Link libstdc++ statically into the gcc binary"
     default y
     depends on CONFIGURE_has_static_link || CANADIAN || CROSS_NATIVE
     select WANTS_STATIC_LINK if CROSS || NATIVE
@@ -122,8 +114,7 @@ config CC_GCC_STATIC_LIBSTDCXX
       along with it.
 
 config CC_GCC_SYSTEM_ZLIB
-    bool
-    prompt "Use system zlib"
+    bool "Use system zlib"
     help
       Do not use bundled zlib, and use the zlib already available for
       the host (eg. the system library).
@@ -253,7 +244,7 @@ config CC_GCC_LIBSANITIZER
     bool
     prompt "Compile libsanitizer"
     depends on THREADS_NATIVE
-    depends on ! LIBC_UCLIBC && ! LIBC_MUSL # Currently lacks required headers (like netrom.h)
+    depends on !LIBC_UCLIBC && !LIBC_MUSL # Currently lacks required headers (like netrom.h)
     help
       libsanitizer is a library which provides run-time sanitising of either
       or both of:
@@ -269,7 +260,7 @@ config CC_GCC_LIBMPX
     depends on CC_GCC_HAS_LIBMPX
     depends on ARCH_X86
     # MUSL does not define libc types that GCC requires. Mingw lacks certain headers.
-    depends on !LIBC_MUSL && ! LIBC_MINGW
+    depends on !LIBC_MUSL && !LIBC_MINGW
     help
       Enable GCC support for Intel Memory Protection Extensions (MPX).
 
-- 
cgit v0.10.2-6-g49f6