Merge pull request #1471 from IKukhta/feature/manual_GCC_LIBSSP_option

Extend CC_GCC_LIBSSP with manual state
This commit is contained in:
Chris Packham 2021-03-18 15:45:38 +13:00 committed by GitHub
commit 6729a76d0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions

View File

@ -218,12 +218,18 @@ config CC_GCC_LIBGOMP
The default is 'N'. Say 'Y' if you need it, and report success/failure.
config CC_GCC_LIBSSP
bool
tristate
prompt "Compile libssp"
help
libssp is the run-time Stack-Smashing Protection library.
The default is 'N'. Say 'Y' if you need it, and report success/failure.
Option | SSP implementation | libssp built | Associated ./configure switch
---------+---------------------+--------------+-------------------------------
Y | libssp (forced) | yes | --enable-libssp
M | libc (if available) | yes | (none, ./configure decides)
N | libc (forced) | no | --disable-libssp
The default is 'N'. Say 'Y' or 'M' if you need it, and report success/failure.
config CC_GCC_LIBQUADMATH
bool

View File

@ -405,11 +405,11 @@ do_gcc_core_backend() {
extra_config+=(--disable-libmudflap)
extra_config+=(--disable-libmpx)
if [ "${CT_CC_GCC_LIBSSP}" = "y" ]; then
extra_config+=(--enable-libssp)
else
extra_config+=(--disable-libssp)
fi
case "${CT_CC_GCC_LIBSSP}" in
y) extra_config+=(--enable-libssp);;
m) ;;
"") extra_config+=(--disable-libssp);;
esac
if [ "${CT_CC_GCC_LIBQUADMATH}" = "y" ]; then
extra_config+=(--enable-libquadmath)
extra_config+=(--enable-libquadmath-support)
@ -1015,11 +1015,11 @@ do_gcc_backend() {
else
extra_config+=(--disable-libgomp)
fi
if [ "${CT_CC_GCC_LIBSSP}" = "y" ]; then
extra_config+=(--enable-libssp)
else
extra_config+=(--disable-libssp)
fi
case "${CT_CC_GCC_LIBSSP}" in
y) extra_config+=(--enable-libssp);;
m) ;;
"") extra_config+=(--disable-libssp);;
esac
if [ "${CT_CC_GCC_LIBQUADMATH}" = "y" ]; then
extra_config+=(--enable-libquadmath)
extra_config+=(--enable-libquadmath-support)