2 files changed, 15 insertions, 0 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 101f2b2..9cc903f 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -160,6 +160,7 @@ config CC_GCC_5
     select CC_GCC_HAS_LNK_HASH_STYLE
     select CC_GCC_HAS_LIBQUADMATH
     select CC_GCC_HAS_LIBSANITIZER
+    select CC_GCC_HAS_LIBMPX
     select CC_SUPPORT_GOLANG
 
 config CC_GCC_5_or_later
@@ -178,6 +179,7 @@ config CC_GCC_6
     select CC_GCC_HAS_LNK_HASH_STYLE
     select CC_GCC_HAS_LIBQUADMATH
     select CC_GCC_HAS_LIBSANITIZER
+    select CC_GCC_HAS_LIBMPX
     select CC_SUPPORT_GOLANG
 
 config CC_GCC_6_or_later
@@ -276,6 +278,9 @@ config CC_GCC_HAS_LIBQUADMATH
 config CC_GCC_HAS_LIBSANITIZER
     bool
 
+config CC_GCC_HAS_LIBMPX
+    bool
+
 if ! CC_GCC_CUSTOM
 
 config CC_GCC_VERSION
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index c200d22..b7353df 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -182,6 +182,16 @@ config CC_GCC_LIBSANITIZER
 
       The default is 'N'. Say 'Y' if you need it, and report success/failure.
 
+config CC_GCC_LIBMPX
+    bool
+    default y
+    prompt "Compile libmpx"
+    depends on CC_GCC_HAS_LIBMPX
+    depends on ARCH_x86
+    depends on !LIBC_musl # MUSL does not define libc types that GCC requires
+    help
+      Enable GCC support for Intel Memory Protection Extensions (MPX).
+
 #-----------------------------------------------------------------------------
 
 comment "Misc. obscure options."