[PATCH 1/2] symbols/x86: re-number intermediate files

[Jan Beulich <jbeulich@xxxxxxxx>]

In preparation to do away with symbols-dummy, re-number the file 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@xxxxxxxx>
---
Will want mirroring to other arch-es if the other patch is to be mirrored.

--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -138,17 +138,17 @@ $(TARGET)-syms: $(objtree)/prelink.o $(o
            $(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
+               > $(dot-target).1.S
+       $(MAKE) $(build)=$(@D) $(dot-target).1.o
        $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
-           $(dot-target).0.o -o $(dot-target).1
+           $(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).1.S
-       $(MAKE) $(build)=$(@D) $(dot-target).1.o
-       $(call compare-symbol-tables, $(dot-target).0.o, $(dot-target).1.o)
+               > $(dot-target).2.S
+       $(MAKE) $(build)=$(@D) $(dot-target).2.o
+       $(call compare-symbol-tables, $(dot-target).1.o, $(dot-target).2.o)
        $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
-           $(orphan-handling-y) $(dot-target).1.o -o $@
+           $(orphan-handling-y) $(dot-target).2.o -o $@
        $(NM) -pa --format=sysv $@ \
                | $(objtree)/tools/symbols --all-symbols --xensyms --sysv 
--sort \
                > $@.map
@@ -212,25 +212,25 @@ 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
+               > $(dot-target).1r.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
+               > $(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).0r.o $(dot-target).0s.o 
$(note_file_option) \
+                       $(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).1r.S
+               > $(dot-target).2r.S
        $(NM) -pa --format=sysv $(dot-target).$(VIRT_BASE).1 \
                | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
-               > $(dot-target).1s.S
-       $(MAKE) $(build)=$(@D) .$(@F).1r.o .$(@F).1s.o
-       $(call compare-symbol-tables, $(dot-target).0r.o, $(dot-target).1r.o)
-       $(call compare-symbol-tables, $(dot-target).0s.o, $(dot-target).1s.o)
+               > $(dot-target).2s.S
+       $(MAKE) $(build)=$(@D) .$(@F).2r.o .$(@F).2s.o
+       $(call compare-symbol-tables, $(dot-target).1r.o, $(dot-target).2r.o)
+       $(call compare-symbol-tables, $(dot-target).1s.o, $(dot-target).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 \