diff options
| author |   Bryan Hundven <bryanhundven@gmail.com> | 2016-10-04 23:18:45 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2016-10-04 23:18:45 (GMT) |
| commit | 3ec2211548a853203e070af6810f49825ec46a6a (patch) | |
| tree | 81ad69fc8627842150cfe5b3deb9c4679a5ffc69 | |
| parent | 62e136d46d1f1164116dbf0732ef94f9db95fec1 (diff) | |
| parent | 33fccf98382d2c28af8d8530f3b20d76f61b19f8 (diff) | |
Merge pull request #451 from stilor/x86-musl
Disable libmpx in x86-musl.
| -rw-r--r-- | config/cc/gcc.in | 5 | ||||
| -rw-r--r-- | config/cc/gcc.in.2 | 10 | ||||
| -rw-r--r-- | scripts/build/cc/100-gcc.sh | 9 |
3 files changed, 24 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." diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh index b44d85e..14edcd4 100644 --- a/scripts/build/cc/100-gcc.sh +++ b/scripts/build/cc/100-gcc.sh @@ -436,6 +436,7 @@ do_gcc_core_backend() { extra_config+=(--disable-libgomp) extra_config+=(--disable-libmudflap) + extra_config+=(--disable-libmpx) if [ "${CT_CC_GCC_LIBSSP}" = "y" ]; then extra_config+=(--enable-libssp) @@ -929,6 +930,14 @@ do_gcc_backend() { fi fi + if [ "${CT_CC_GCC_HAS_LIBMPX}" = "y" ]; then + if [ "${CT_CC_GCC_LIBMPX}" = "y" ]; then + extra_config+=(--enable-libmpx) + else + extra_config+=(--disable-libmpx) + fi + fi + final_LDFLAGS+=("${ldflags}") # *** WARNING ! *** |