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.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/riscv/Makefile
+++ b/xen/arch/riscv/Makefile
@@ -26,16 +26,16 @@ $(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 $< \
- $(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 \
- > $(dot-target).1.S
- $(MAKE) $(build)=$(@D) $(dot-target).1.o
+ > $(dot-target).2.S
+ $(MAKE) $(build)=$(@D) $(dot-target).2.o
$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
- $(dot-target).1.o -o $@
+ $(dot-target).2.o -o $@
$(NM) -pa --format=sysv $@ \
| $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \
> $@.map
On 11/26/25 2:44 PM, Jan Beulich wrote: > 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. > > Signed-off-by: Jan Beulich<jbeulich@suse.com> > > --- a/xen/arch/riscv/Makefile > +++ b/xen/arch/riscv/Makefile > @@ -26,16 +26,16 @@ $(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 $< \ > - $(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 \ > - > $(dot-target).1.S > - $(MAKE) $(build)=$(@D) $(dot-target).1.o > + > $(dot-target).2.S > + $(MAKE) $(build)=$(@D) $(dot-target).2.o > $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \ - $(dot-target).1.o -o $@ + $(dot-target).2.o > -o $@ $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols > --all-symbols --xensyms --sysv --sort \ > $@.map > LGTM: Reviewed-By: Oleksii Kurochko<oleksii.kurochko@gmail.com> ~ Oleksii
On 27.11.2025 10:49, Oleksii Kurochko wrote: > > On 11/26/25 2:44 PM, Jan Beulich wrote: >> 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. >> >> Signed-off-by: Jan Beulich<jbeulich@suse.com> >> >> --- a/xen/arch/riscv/Makefile >> +++ b/xen/arch/riscv/Makefile >> @@ -26,16 +26,16 @@ $(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 $< \ >> - $(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 \ >> - > $(dot-target).1.S >> - $(MAKE) $(build)=$(@D) $(dot-target).1.o >> + > $(dot-target).2.S >> + $(MAKE) $(build)=$(@D) $(dot-target).2.o >> $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \ - $(dot-target).1.o -o $@ + $(dot-target).2.o >> -o $@ $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols >> --all-symbols --xensyms --sysv --sort \ > $@.map >> > LGTM: Reviewed-By: Oleksii Kurochko<oleksii.kurochko@gmail.com> Thanks. May I remind you again that there wants to be a blank before the opening angle bracket? That is an issue which was also pointed out for some of your recent release-acks. (Canonically, the "-by" also wants to be all lower case, I think.) Jan
On 11/27/25 10:57 AM, Jan Beulich wrote: > On 27.11.2025 10:49, Oleksii Kurochko wrote: >> On 11/26/25 2:44 PM, Jan Beulich wrote: >>> 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. >>> >>> Signed-off-by: Jan Beulich<jbeulich@suse.com> >>> >>> --- a/xen/arch/riscv/Makefile >>> +++ b/xen/arch/riscv/Makefile >>> @@ -26,16 +26,16 @@ $(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 $< \ >>> - $(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 \ >>> - > $(dot-target).1.S >>> - $(MAKE) $(build)=$(@D) $(dot-target).1.o >>> + > $(dot-target).2.S >>> + $(MAKE) $(build)=$(@D) $(dot-target).2.o >>> $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \ - $(dot-target).1.o -o $@ + $(dot-target).2.o >>> -o $@ $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols >>> --all-symbols --xensyms --sysv --sort \ > $@.map >>> >> LGTM: Reviewed-By: Oleksii Kurochko<oleksii.kurochko@gmail.com> > Thanks. May I remind you again that there wants to be a blank before the > opening angle bracket? That is an issue which was also pointed out for > some of your recent release-acks. Hmm, something wrong with a setting in my e-mail app because I am looking at my reply in my e-mail app and there is a space before the opening angle bracket... > (Canonically, the "-by" also wants to > be all lower case, I think.) I was sure that I had seen “-by” written with an uppercase letter, but I will use lowercase in the future. I tried using|git log --grep|, and it seems I was mistaken — “-by” is always lowercase. I didn’t see your answer, so I made the same mistake with “-by” in the next patch as well. ~ Oleksii
© 2016 - 2025 Red Hat, Inc.