Skip to content

Commit

Permalink
Add a checkbox for libmpx build.
Browse files Browse the repository at this point in the history
Disable libmpx for musl builds.

Signed-off-by: Alexey Neyman <stilor@att.net>
  • Loading branch information
stilor committed Sep 23, 2016
1 parent 531eab4 commit 651567f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 0 deletions.
5 changes: 5 additions & 0 deletions config/cc/gcc.in
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions config/cc/gcc.in.2
Expand Up @@ -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."
Expand Down
9 changes: 9 additions & 0 deletions scripts/build/cc/100-gcc.sh
Expand Up @@ -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)
Expand Down Expand Up @@ -904,6 +905,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 ! ***
Expand Down

0 comments on commit 651567f

Please sign in to comment.