From 8b4373d4eeaff35ce6cd18faa87a3b90fbd2ea3f Mon Sep 17 00:00:00 2001
From: Ivan Kukhta <Ivan.Kukhta@acronis.com>
Date: Wed, 17 Mar 2021 13:46:14 +0300
Subject: Extend CC_GCC_LIBSSP with manual state

Signed-off-by: Ivan Kukhta <Ivan.Kukhta@acronis.com>

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 21e7db0..c3918e8 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -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
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index b96bb89..cccd654 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -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)
-- 
cgit v0.10.2-6-g49f6