1From f9207376ed58836bf748cc4cea0fcbf46624a709 Mon Sep 17 00:00:00 2001
2From: Mikko Rapeli <mikko.rapeli@linaro.org>
3Date: Thu, 1 Aug 2024 14:03:11 +0000
4Subject: [PATCH 2/3] link.mk: use CFLAGS with version.o
5
6Should be used by all compilations.
7
8Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
9Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
10---
11 core/arch/arm/kernel/link.mk   | 2 +-
12 core/arch/riscv/kernel/link.mk | 2 +-
13 2 files changed, 2 insertions(+), 2 deletions(-)
14
15Upstream-Status: Backport
16
17diff --git a/core/arch/arm/kernel/link.mk b/core/arch/arm/kernel/link.mk
18index 49e9f4fa1..377a82b65 100644
19--- a/core/arch/arm/kernel/link.mk
20+++ b/core/arch/arm/kernel/link.mk
21@@ -151,7 +151,7 @@ define update-buildcount
22 endef
23
24 # filter-out to workaround objdump warning
25-version-o-cflags = $(filter-out -g3,$(core-platform-cflags) \
26+version-o-cflags = $(filter-out -g3,$(CFLAGS) $(core-platform-cflags) \
27 			$(platform-cflags) $(cflagscore))
28 # SOURCE_DATE_EPOCH defined for reproducible builds
29 ifneq ($(SOURCE_DATE_EPOCH),)
30diff --git a/core/arch/riscv/kernel/link.mk b/core/arch/riscv/kernel/link.mk
31index 3d1000d15..1fff0a379 100644
32--- a/core/arch/riscv/kernel/link.mk
33+++ b/core/arch/riscv/kernel/link.mk
34@@ -62,7 +62,7 @@ define update-buildcount
35 endef
36
37 # filter-out to workaround objdump warning
38-version-o-cflags = $(filter-out -g3,$(core-platform-cflags) \
39+version-o-cflags = $(filter-out -g3,$(CFLAGS) $(core-platform-cflags) \
40 			$(platform-cflags) $(cflagscore))
41 # SOURCE_DATE_EPOCH defined for reproducible builds
42 ifneq ($(SOURCE_DATE_EPOCH),)
43--
442.34.1
45
46