From aa44f3c0a697cc387f79958d73e21594a9059cf6 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Tue, 12 Oct 2021 11:50:47 +0200 Subject: [PATCH] build,arm: move LDFLAGS change to arch.mk Changes to XEN_LDFLAGS may or may not apply to targets in for example "common/" depending on whether one runs `make` or `make common/`. But arch.mk is loaded before doing any build, so changes to LDFLAGS there mean that the value of XEN_LDFLAGS won't depends on the initial target. Signed-off-by: Anthony PERARD Acked-by: Julien Grall --- xen/arch/arm/Makefile | 8 -------- xen/arch/arm/arch.mk | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 44d7cc81fa..7dd3ee981a 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -103,14 +103,6 @@ prelink.o: $(ALL_OBJS) $(ALL_LIBS) FORCE $(call if_changed,ld) endif -ifeq ($(CONFIG_ARM64_ERRATUM_843419),y) - ifeq ($(call ld-option, --fix-cortex-a53-843419),n) - $(warning ld does not support --fix-cortex-a53-843419; xen may be susceptible to erratum) - else - XEN_LDFLAGS += --fix-cortex-a53-843419 - endif -endif - targets += prelink.o $(TARGET)-syms: prelink.o xen.lds diff --git a/xen/arch/arm/arch.mk b/xen/arch/arm/arch.mk index 11caec86ba..6a29820594 100644 --- a/xen/arch/arm/arch.mk +++ b/xen/arch/arm/arch.mk @@ -17,3 +17,11 @@ $(call cc-option-add,CFLAGS-$(CONFIG_ARM_64),CC,-mno-outline-atomics) ifneq ($(filter command line environment,$(origin CONFIG_EARLY_PRINTK)),) $(error You must use 'make menuconfig' to enable/disable early printk now) endif + +ifeq ($(CONFIG_ARM64_ERRATUM_843419),y) + ifeq ($(call ld-option, --fix-cortex-a53-843419),n) + $(warning ld does not support --fix-cortex-a53-843419; xen may be susceptible to erratum) + else + LDFLAGS += --fix-cortex-a53-843419 + endif +endif -- 2.30.2