Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2017-02-18 18:41:04 -08:00
parent f0716643b4
commit 264b0c8686
3 changed files with 16 additions and 34 deletions
config/cc
scripts/build/cc

View File

@ -130,8 +130,6 @@ config CC_GCC_4_8
select CC_GCC_4_8_or_later
select CC_GCC_USE_GMP_MPFR
select CC_GCC_USE_MPC
select CC_GCC_HAS_LIBQUADMATH
select CC_GCC_HAS_LIBSANITIZER
select CC_SUPPORT_GOLANG
config CC_GCC_4_8_or_later
@ -142,8 +140,6 @@ config CC_GCC_4_9
select CC_GCC_4_9_or_later
select CC_GCC_USE_GMP_MPFR
select CC_GCC_USE_MPC
select CC_GCC_HAS_LIBQUADMATH
select CC_GCC_HAS_LIBSANITIZER
select CC_SUPPORT_GOLANG
config CC_GCC_4_9_or_later
@ -155,8 +151,6 @@ config CC_GCC_5
select CC_GCC_5_or_later
select CC_GCC_USE_GMP_MPFR
select CC_GCC_USE_MPC
select CC_GCC_HAS_LIBQUADMATH
select CC_GCC_HAS_LIBSANITIZER
select CC_GCC_HAS_LIBMPX
select CC_SUPPORT_GOLANG
@ -169,8 +163,6 @@ config CC_GCC_6
select CC_GCC_6_or_later
select CC_GCC_USE_GMP_MPFR
select CC_GCC_USE_MPC
select CC_GCC_HAS_LIBQUADMATH
select CC_GCC_HAS_LIBSANITIZER
select CC_GCC_HAS_LIBMPX
select CC_SUPPORT_GOLANG
@ -183,8 +175,6 @@ config CC_GCC_latest
select CC_GCC_6_or_later
select CC_GCC_USE_GMP_MPFR
select CC_GCC_USE_MPC
select CC_GCC_HAS_LIBQUADMATH
select CC_GCC_HAS_LIBSANITIZER
# Only enable gcc's support for plugins if binutils has it as well
# They are useful only when doing LTO, but it does no harm enabling

View File

@ -177,7 +177,6 @@ config CC_GCC_LIBSSP
config CC_GCC_LIBQUADMATH
bool
prompt "Compile libquadmath"
depends on CC_GCC_HAS_LIBQUADMATH
help
libquadmath is a library which provides quad-precision mathematical
functions on targets supporting the __float128 datatype. See:
@ -188,7 +187,6 @@ config CC_GCC_LIBQUADMATH
config CC_GCC_LIBSANITIZER
bool
prompt "Compile libsanitizer"
depends on CC_GCC_HAS_LIBSANITIZER
depends on THREADS_NATIVE
depends on ! LIBC_uClibc && ! LIBC_musl # Currently lacks required headers (like netrom.h)
help

View File

@ -434,14 +434,12 @@ do_gcc_core_backend() {
else
extra_config+=(--disable-libssp)
fi
if [ "${CT_CC_GCC_HAS_LIBQUADMATH}" = "y" ]; then
if [ "${CT_CC_GCC_LIBQUADMATH}" = "y" ]; then
extra_config+=(--enable-libquadmath)
extra_config+=(--enable-libquadmath-support)
else
extra_config+=(--disable-libquadmath)
extra_config+=(--disable-libquadmath-support)
fi
if [ "${CT_CC_GCC_LIBQUADMATH}" = "y" ]; then
extra_config+=(--enable-libquadmath)
extra_config+=(--enable-libquadmath-support)
else
extra_config+=(--disable-libquadmath)
extra_config+=(--disable-libquadmath-support)
fi
core_LDFLAGS+=("${ldflags}")
@ -928,22 +926,18 @@ do_gcc_backend() {
else
extra_config+=(--disable-libssp)
fi
if [ "${CT_CC_GCC_HAS_LIBQUADMATH}" = "y" ]; then
if [ "${CT_CC_GCC_LIBQUADMATH}" = "y" ]; then
extra_config+=(--enable-libquadmath)
extra_config+=(--enable-libquadmath-support)
else
extra_config+=(--disable-libquadmath)
extra_config+=(--disable-libquadmath-support)
fi
if [ "${CT_CC_GCC_LIBQUADMATH}" = "y" ]; then
extra_config+=(--enable-libquadmath)
extra_config+=(--enable-libquadmath-support)
else
extra_config+=(--disable-libquadmath)
extra_config+=(--disable-libquadmath-support)
fi
if [ "${CT_CC_GCC_HAS_LIBSANITIZER}" = "y" ]; then
if [ "${CT_CC_GCC_LIBSANITIZER}" = "y" ]; then
extra_config+=(--enable-libsanitizer)
else
extra_config+=(--disable-libsanitizer)
fi
if [ "${CT_CC_GCC_LIBSANITIZER}" = "y" ]; then
extra_config+=(--enable-libsanitizer)
else
extra_config+=(--disable-libsanitizer)
fi
if [ "${CT_CC_GCC_HAS_LIBMPX}" = "y" ]; then