summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.ac12
-rw-r--r--solenv/gbuild/platform/com_GCC_defs.mk6
3 files changed, 2 insertions, 17 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index 91ced61d3d94..cbfa19f0e7b4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -244,7 +244,6 @@ export USING_X11=@USING_X11@
export HAMCREST_JAR=@HAMCREST_JAR@
export HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED@
export HAVE_GCC_AVX=@HAVE_GCC_AVX@
-export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
export HAVE_GCC_BUILTIN_FFS=@HAVE_GCC_BUILTIN_FFS@
export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@
diff --git a/configure.ac b/configure.ac
index 0c8388fbc9a5..809ed94733a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6167,17 +6167,6 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
AC_MSG_RESULT([no])
fi
- AC_MSG_CHECKING([whether $CC_BASE supports -fstack-protector-strong])
- save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -O0 -Werror -fstack-protector-strong"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ char a[8]; a[7] = 0; ]])],[ HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
- CFLAGS=$save_CFLAGS
- if test "$HAVE_GCC_STACK_PROTECTOR_STRONG" = "TRUE"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
-
AC_MSG_CHECKING([whether $CC_BASE supports atomic functions])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
int v = 0;
@@ -6349,7 +6338,6 @@ AC_LANG_POP([C++])
fi
AC_SUBST(HAVE_GCC_AVX)
-AC_SUBST(HAVE_GCC_STACK_PROTECTOR_STRONG)
AC_SUBST(HAVE_GCC_BUILTIN_ATOMIC)
AC_SUBST(HAVE_GCC_BUILTIN_FFS)
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 2c3d5f1a98f3..712a61df544f 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -67,6 +67,7 @@ gb_CFLAGS_COMMON := \
-fmessage-length=0 \
-fno-common \
-pipe \
+ -fstack-protector-strong \
gb_CXXFLAGS_COMMON := \
-Wall \
@@ -81,6 +82,7 @@ gb_CXXFLAGS_COMMON := \
-fmessage-length=0 \
-fno-common \
-pipe \
+ -fstack-protector-strong \
gb_CXXFLAGS_DISABLE_WARNINGS = -w
@@ -134,11 +136,7 @@ endif
gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden
gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
-ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE)
-gb_CFLAGS_COMMON += -fstack-protector-strong
-gb_CXXFLAGS_COMMON += -fstack-protector-strong
gb_LinkTarget_LDFLAGS += -fstack-protector-strong
-endif
ifneq ($(ENABLE_PCH),)
ifeq ($(COM_IS_CLANG),TRUE)