|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 5/6] 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>
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -465,10 +465,6 @@ ALL_OBJS-$(CONFIG_CRYPTO) += crypto/buil
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 FO
$(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
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -179,14 +179,14 @@ ifeq ($(XEN_BUILD_PE),y)
$(MKRELOC) $^ > $@
.$(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 \
> $@
--- 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
@@ -15,7 +19,7 @@ final-image-check-y ?= true
$(call if_changed,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
@@ -23,7 +27,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)) \
> $@
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |