mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
symbols/x86: re-number intermediate files
In preparation to do away with symbols-dummy, re-number the assembly and object files used, for the numbers to match the next passes real output. This is to make 0 available to use for what now is handled by symbols-dummy. (Mirror the numbering to the intermediate reloc files for xen.efi, just to avoid confusion.) Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Roger Pau Monné <roger.pau@citrix.com>
This commit is contained in:
Jan Beulich committed
1 parent
b3ad7637ba
commit
5c1c05b27b
1 file changed
+19
-19
+19
-19
@@ -138,16 +138,16 @@ $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds
|
||||
$(objtree)/common/symbols-dummy.o -o $(dot-target).0
|
||||
$(NM) -pa --format=sysv $(dot-target).0 \
|
||||
| $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
|
||||
> $(dot-target).0.S
|
||||
$(MAKE) $(build)=$(@D) $(dot-target).0.o
|
||||
$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
|
||||
$(dot-target).0.o -o $(dot-target).1
|
||||
$(NM) -pa --format=sysv $(dot-target).1 \
|
||||
| $(objtree)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \
|
||||
> $(dot-target).1.S
|
||||
$(MAKE) $(build)=$(@D) $(dot-target).1.o
|
||||
$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
|
||||
$(orphan-handling-y) $(dot-target).1.o -o $@
|
||||
$(dot-target).1.o -o $(dot-target).1
|
||||
$(NM) -pa --format=sysv $(dot-target).1 \
|
||||
| $(objtree)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \
|
||||
> $(dot-target).2.S
|
||||
$(MAKE) $(build)=$(@D) $(dot-target).2.o
|
||||
$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
|
||||
$(orphan-handling-y) $(dot-target).2.o -o $@
|
||||
$(NM) -pa --format=sysv $@ \
|
||||
| $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \
|
||||
> $@.map
|
||||
@@ -211,23 +211,23 @@ endif
|
||||
$(objtree)/common/symbols-dummy.o $(note_file_option) \
|
||||
-o $(dot-target).$(base).0 &&) :
|
||||
$(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(dot-target).$(base).0) \
|
||||
> $(dot-target).0r.S
|
||||
$(NM) -pa --format=sysv $(dot-target).$(VIRT_BASE).0 \
|
||||
| $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
|
||||
> $(dot-target).0s.S
|
||||
$(MAKE) $(build)=$(@D) .$(@F).0r.o .$(@F).0s.o
|
||||
$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
|
||||
$(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds $< \
|
||||
$(dot-target).0r.o $(dot-target).0s.o $(note_file_option) \
|
||||
-o $(dot-target).$(base).1 &&) :
|
||||
$(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(dot-target).$(base).1) \
|
||||
> $(dot-target).1r.S
|
||||
$(NM) -pa --format=sysv $(dot-target).$(VIRT_BASE).1 \
|
||||
$(NM) -pa --format=sysv $(dot-target).$(VIRT_BASE).0 \
|
||||
| $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
|
||||
> $(dot-target).1s.S
|
||||
$(MAKE) $(build)=$(@D) .$(@F).1r.o .$(@F).1s.o
|
||||
$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
|
||||
$(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds $< \
|
||||
$(dot-target).1r.o $(dot-target).1s.o $(note_file_option) \
|
||||
-o $(dot-target).$(base).1 &&) :
|
||||
$(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(dot-target).$(base).1) \
|
||||
> $(dot-target).2r.S
|
||||
$(NM) -pa --format=sysv $(dot-target).$(VIRT_BASE).1 \
|
||||
| $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
|
||||
> $(dot-target).2s.S
|
||||
$(MAKE) $(build)=$(@D) .$(@F).2r.o .$(@F).2s.o
|
||||
$(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T $(obj)/efi.lds $< \
|
||||
$(dot-target).1r.o $(dot-target).1s.o $(orphan-handling-y) \
|
||||
$(dot-target).2r.o $(dot-target).2s.o $(orphan-handling-y) \
|
||||
$(note_file_option) -o $@
|
||||
$(NM) -pa --format=sysv $@ \
|
||||
| $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \
|
||||
|
||||