| Message ID | 20230523163811.30792-11-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | build: cleanup build log, avoid user's CFLAGS, avoid too many include of Config.mk | expand |
> On 23 May 2023, at 17:38, Anthony PERARD <anthony.perard@citrix.com> wrote: > > We don't want the AFLAGS from the environment, they are usually meant > to build user space application and not for the hypervisor. > > Config.mk doesn't provied any $(AFLAGS) so we can start a fresh > $(XEN_AFLAGS). > > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> > --- Reviewed-by: Luca Fancellu <luca.fancellu@arm.com> Tested-by: Luca Fancellu <luca.fancellu@arm.com>
> On 24 May 2023, at 09:29, Luca Fancellu <Luca.Fancellu@arm.com> wrote: > > > >> On 23 May 2023, at 17:38, Anthony PERARD <anthony.perard@citrix.com> wrote: >> >> We don't want the AFLAGS from the environment, they are usually meant >> to build user space application and not for the hypervisor. >> >> Config.mk doesn't provied any $(AFLAGS) so we can start a fresh NIT: there is a typo s/provied/provide/ >> $(XEN_AFLAGS). >> >> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> >> --- > > Reviewed-by: Luca Fancellu <luca.fancellu@arm.com> > Tested-by: Luca Fancellu <luca.fancellu@arm.com> > > >
On 24.05.2023 10:47, Luca Fancellu wrote: > > >> On 24 May 2023, at 09:29, Luca Fancellu <Luca.Fancellu@arm.com> wrote: >> >> >> >>> On 23 May 2023, at 17:38, Anthony PERARD <anthony.perard@citrix.com> wrote: >>> >>> We don't want the AFLAGS from the environment, they are usually meant >>> to build user space application and not for the hypervisor. >>> >>> Config.mk doesn't provied any $(AFLAGS) so we can start a fresh > > NIT: there is a typo s/provied/provide/ And preferably with that adjustment ... >>> $(XEN_AFLAGS). >>> >>> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> >>> --- >> >> Reviewed-by: Luca Fancellu <luca.fancellu@arm.com> >> Tested-by: Luca Fancellu <luca.fancellu@arm.com> Acked-by: Jan Beulich <jbeulich@suse.com> There is some interaction with the asm-offsets change, but I think the two patches are still functionally and contextually independent (and hence the one here could go in ahead of the other one earlier in the series, with said adjustment made while committing). Please confirm. Jan
diff --git a/xen/Makefile b/xen/Makefile index 127c0e40b5..c4a83fca76 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -258,6 +258,8 @@ export KBUILD_DEFCONFIG := $(ARCH)_defconfig # reparsing Config.mk by e.g. arch/x86/boot/. export XEN_TREEWIDE_CFLAGS := $(CFLAGS) +XEN_AFLAGS = + # CLANG_FLAGS needs to be calculated before calling Kconfig ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),) CLANG_FLAGS := @@ -412,9 +414,9 @@ ifneq ($(CONFIG_CC_IS_CLANG),y) CFLAGS += -Wa,--strip-local-absolute endif -AFLAGS += -D__ASSEMBLY__ +XEN_AFLAGS += -D__ASSEMBLY__ -$(call cc-option-add,AFLAGS,CC,-Wa$(comma)--noexecstack) +$(call cc-option-add,XEN_AFLAGS,CC,-Wa$(comma)--noexecstack) LDFLAGS-$(call ld-option,--warn-rwx-segments) += --no-warn-rwx-segments @@ -425,7 +427,7 @@ CFLAGS += $(EXTRA_CFLAGS_XEN_CORE) # Most CFLAGS are safe for assembly files: # -std=gnu{89,99} gets confused by #-prefixed end-of-line comments # -flto makes no sense and annoys clang -AFLAGS += $(filter-out -std=gnu% -flto,$(CFLAGS)) $(AFLAGS-y) +XEN_AFLAGS += $(filter-out -std=gnu% -flto,$(CFLAGS)) $(AFLAGS-y) # LDFLAGS are only passed directly to $(LD) LDFLAGS += $(LDFLAGS_DIRECT) $(LDFLAGS-y) @@ -462,7 +464,7 @@ include $(srctree)/arch/$(TARGET_ARCH)/arch.mk # define new variables to avoid the ones defined in Config.mk export XEN_CFLAGS := $(CFLAGS) -export XEN_AFLAGS := $(AFLAGS) +export XEN_AFLAGS := $(XEN_AFLAGS) export XEN_LDFLAGS := $(LDFLAGS) export CFLAGS_UBSAN diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 7b5be9fe46..13ec88a628 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -80,7 +80,7 @@ ifeq ($(CONFIG_LD_IS_GNU),y) AFLAGS-$(call ld-option,--print-output-format) += -DHAVE_LD_SORT_BY_INIT_PRIORITY else # Assume all versions of LLD support this. -AFLAGS += -DHAVE_LD_SORT_BY_INIT_PRIORITY +XEN_AFLAGS += -DHAVE_LD_SORT_BY_INIT_PRIORITY endif ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y)
We don't want the AFLAGS from the environment, they are usually meant to build user space application and not for the hypervisor. Config.mk doesn't provied any $(AFLAGS) so we can start a fresh $(XEN_AFLAGS). Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- xen/Makefile | 10 ++++++---- xen/arch/x86/arch.mk | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-)