[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] build: move $(all-symbols-*)



commit 0a609dc49ac5ea51ed553a779b6766a8bdbf8e86
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Sep 22 09:20:10 2026 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Sep 22 09:59:24 2026 +0200

    build: move $(all-symbols-*)
    
    With the final linking logic now consolidated in scripts/Makefile.link,
    $(all-symbols-*) also doesn't need setting anymore in (and passing down
    from) the top level Makefile.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
 xen/Makefile              | 7 +------
 xen/arch/x86/Makefile     | 4 ++--
 xen/scripts/Makefile.link | 8 ++++++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/xen/Makefile b/xen/Makefile
index 8c56295493..52ea283f5c 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -465,10 +465,6 @@ ALL_OBJS-$(CONFIG_CRYPTO) += crypto/built_in.o
 ARCH_LIBS-y               :=
 ALL_LIBS-y                := lib/lib.a
 
-all-symbols-y :=
-all-symbols-$(CONFIG_LIVEPATCH) += --all-symbols
-all-symbols-$(CONFIG_FAST_SYMBOL_LOOKUP) += --sort-by-name
-
 include $(srctree)/arch/$(SRCARCH)/arch.mk
 
 # define new variables to avoid the ones defined in Config.mk
@@ -622,8 +618,7 @@ $(TARGET): outputmakefile asm-generic FORCE
        $(Q)$(MAKE) $(build)=arch/$(SRCARCH) include
        $(Q)$(MAKE) $(build)=. arch/$(SRCARCH)/include/asm/asm-offsets.h
        $(Q)$(MAKE) $(build)=. MKRELOC=$(MKRELOC) 'ALL_OBJS=$(ALL_OBJS-y)' \
-                   'ALL_LIBS=$(ARCH_LIBS-y) $(ALL_LIBS-y)' \
-                   'all_symbols=$(all-symbols-y)' $@
+                   'ALL_LIBS=$(ARCH_LIBS-y) $(ALL_LIBS-y)' $@
 
 SUBDIRS = xsm arch common crypto drivers lib test
 define all_sources
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 8a205c3d27..2be90ea098 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -183,14 +183,14 @@ ifeq ($(XEN_BUILD_PE),y)
        $(MKRELOC) $(filter .$(TARGET).efi.%, $^) > $@
 
 .$(TARGET).efi.0s.S:
-       $(objtree)/tools/symbols $(all_symbols) --empty > $@
+       $(objtree)/tools/symbols $(all-symbols-y) --empty > $@
 
 .$(TARGET).efi.1s.S: .$(TARGET).efi.0
 .$(TARGET).efi.2s.S: .$(TARGET).efi.1
 
 .$(TARGET).efi.%s.S:
        $(NM) -pa --format=sysv $< \
-         | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
+         | $(objtree)/tools/symbols $(all-symbols-y) --sysv --sort \
            --source-name=$(TARGET).efi.S \
          > $@
 
diff --git a/xen/scripts/Makefile.link b/xen/scripts/Makefile.link
index 4b8ae90eee..11d3fc48da 100644
--- a/xen/scripts/Makefile.link
+++ b/xen/scripts/Makefile.link
@@ -3,6 +3,10 @@
 # Helper rules for linking xen-syms
 # ==========================================================================
 
+all-symbols-y :=
+all-symbols-$(CONFIG_LIVEPATCH) += --all-symbols
+all-symbols-$(CONFIG_FAST_SYMBOL_LOOKUP) += --sort-by-name
+
 syms-warn-dup-y := --warn-dup
 syms-warn-dup-$(CONFIG_SUPPRESS_DUPLICATE_SYMBOL_WARNINGS) :=
 syms-warn-dup-$(CONFIG_ENFORCE_UNIQUE_SYMBOLS) := --error-dup
@@ -17,7 +21,7 @@ final-image-check-y ?= true
        $(call cmd,cc_o_S)
 
 .$(TARGET)-syms.0.S:
-       $(objtree)/tools/symbols $(all_symbols) --empty > $@
+       $(objtree)/tools/symbols $(all-symbols-y) --empty > $@
 
 .$(TARGET)-syms.1.S: .$(TARGET)-syms.0
 .$(TARGET)-syms.2.S: .$(TARGET)-syms.1
@@ -25,7 +29,7 @@ final-image-check-y ?= true
 
 .$(TARGET)-syms.%.S:
        $(NM) -pa --format=sysv $< \
-         | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
+         | $(objtree)/tools/symbols $(all-symbols-y) --sysv --sort \
            $(if $(filter $(LAST_LINKING_PASS),$*), $(syms-warn-dup-y)) \
          > $@
 
--
generated by git-patchbot for /home/xen/git/xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.