mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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@suse.com> Reviewed-by: Anthony PERARD <anthony.perard@vates.tech>
This commit is contained in:
1 parent
37cd2d7d46
commit
0a609dc49a
3 files changed
+9
-10
No files matched your search
+1
-6
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
> $@
|
||||
|
||||
|
||||
@@ -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)) \
|
||||
> $@
|
||||
|
||||
|
||||