configure.ac | 5 ++++-
solenv/gbuild/platform/com_GCC_defs.mk | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7a376f4077102bf567a66b0cab8df1c70b0cfe53
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Apr 22 15:11:07 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Apr 23 09:32:04 2024 +0200
add undefining FORTIFY_SOURCE to the gcc no-opt flags
We build non-optimized files by adding the no-opt flags to the compiler
options that include the optimized flags, so add undefining
FORTIFY_SOURCE to the -O0 line
Change-Id: Ib5416ad7f9f5ef907d7c767a5ebff6343b035cfe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166459
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 46ee6aa34278..50351e596c1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7391,8 +7391,11 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
AC_MSG_CHECKING([whether $CC_BASE supports -D_FORTIFY_SOURCE=2])
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Werror -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2"
+ if test "$ENABLE_OPTIMIZED" = TRUE; then
+ CFLAGS="$CFLAGS -O2"
+ fi
AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(, [[return 0;]])],
+ [AC_LANG_PROGRAM([[#include <string.h>]], [[return 0;]])],
[AC_MSG_RESULT([yes]); HARDENING_OPT_CFLAGS="$HARDENING_OPT_CFLAGS
-Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=2"],
[AC_MSG_RESULT([no])])
CFLAGS=$save_CFLAGS
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 4eda340d47e9..aaba5ebb0625 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -228,7 +228,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS :=
$(gb_LinkTarget_EXCEPTIONFLAGS)
gb_PrecompiledHeader_ignore_flags_for_flags_file := -Wunused-macros
# optimization level
-gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
+gb_COMPILERNOOPTFLAGS := -O0 -Wp,-U_FORTIFY_SOURCE -fstrict-aliasing
-fstrict-overflow
gb_COMPILERDEBUGOPTFLAGS := -Og
ifeq ($(OS),ANDROID)
