solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk | 3 +++
solenv/gbuild/platform/LINUX_X86_64_GCC.mk | 2 ++
solenv/gbuild/platform/com_GCC_defs.mk | 6 +++---
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 196c22e88138796fb1204610bd5d4ad8b8cd8a85
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Apr 22 09:03:08 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Apr 22 11:27:51 2024 +0200
generic is x86_64-specific
Change-Id: Ic9912cdebfc75816c54495db4fef68ebeed32c50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166417
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
index 1880b3bad1e4..371fec46751d 100644
--- a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
@@ -10,6 +10,9 @@
#please make generic modifications to unxgcc.mk or linux.mk
gb_CPUDEFS += -DPPC
+gb_COMPILEROPTFLAGS := -O2 \
+ $(if $(filter
powerpc64le-unknown-linux-gnu,$(HOST_PLATFORM)),-mtune=powerpc64le)
+
include $(GBUILDDIR)/platform/linux.mk
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
b/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
index c1a1ceeeefd6..3249b4b9a572 100644
--- a/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
@@ -9,6 +9,8 @@
#please make generic modifications to unxgcc.mk or linux.mk
+gb_COMPILEROPTFLAGS := -O2 -mtune=generic
+
include $(GBUILDDIR)/platform/linux.mk
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 903424972824..a09ee850e96a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -38,11 +38,11 @@ endif
gb_COMPILER_SETUP :=
ifeq ($(strip $(gb_COMPILEROPTFLAGS)),)
-gb_COMPILEROPTFLAGS := \
- -O2 -mtune=generic \
- $(if $(HARDENING_OPT_CFLAGS),$(HARDENING_OPT_CFLAGS))
+gb_COMPILEROPTFLAGS := -O2
endif
+gb_COMPILEROPTFLAGS += $(HARDENING_OPT_CFLAGS)
+
gb_AFLAGS := $(AFLAGS)
gb_COMPILERDEFS := \
