[xen staging-4.21] build/non-x86: fix symbol lookup in presence of build-id

[patchbot@xxxxxxx]

commit 8d7a0f86619c2e2c00c98f2aa5708cd638039815
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Jan 29 13:40:28 2026 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Jan 29 13:40:28 2026 +0100

    build/non-x86: fix symbol lookup in presence of build-id
    
    It's not clear why only x86 had $(build_id_linker) applied to all three
    linking passes. Not doing so will alter symbol offsets between the 2nd
    and 3rd passes for, potentially, all of the symbols at higher addresses
    (intermediate alignment padding may mask this effect, though, so it will
    look as if problems appeared randomly).
    
    Fixes: a353cab905af ("build_id: Provide ld-embedded build-ids")
    Reported-by: Mykola Kvach <xakep.amatop@xxxxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Tested-by: Mykola Kvach <xakep.amatop@xxxxxxxxx> # arm
    Reviewed-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx> # riscv
    Tested-by: Jason Andryuk <jason.andryuk@xxxxxxx> # arm64
    Acked-by: Michal Orzel <michal.orzel@xxxxxxx>
    [jb: backport limited to Arm]
    master commit: f0abe60de13b7ca33464d5715d28e77fb545a1f0
    master date: 2026-01-27 10:26:36 +0100
---
 xen/arch/arm/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index 7494a0f926..95bc7ad25e 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -87,13 +87,13 @@ endif
 $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds
        $(objtree)/tools/symbols $(all_symbols) --empty > $(dot-target).0.S
        $(MAKE) $(build)=$(@D) $(dot-target).0.o
-       $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< \
+       $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
              $(dot-target).0.o -o $(dot-target).0
        $(NM) -pa --format=sysv $(dot-target).0 \
                | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
                > $(dot-target).1.S
        $(MAKE) $(build)=$(@D) $(dot-target).1.o
-       $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< \
+       $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
            $(dot-target).1.o -o $(dot-target).1
        $(NM) -pa --format=sysv $(dot-target).1 \
                | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.21