• Bug#1033676: marked as done (unblock: xen/4.17.0+74-g3eac216e6e-1) (3/3

    From Debian Bug Tracking System@21:1/5 to All on Tue Apr 4 23:40:02 2023
    [continued from previous message]

    diff -Nru xen-4.17.0+46-gaaf74a532c/xen/Rules.mk xen-4.17.0+74-g3eac216e6e/xen/Rules.mk
    --- xen-4.17.0+46-gaaf74a532c/xen/Rules.mk 2023-02-22 15:14:33.000000000 +0100
    +++ xen-4.17.0+74-g3eac216e6e/xen/Rules.mk 2023-03-21 13:47:52.000000000 +0100
    @@ -228,8 +228,9 @@
    ifeq ($(CONFIG_ENFORCE_UNIQUE_SYMBOLS),y)
    cmd_cc_o_c = $(CC) $(c_flags) -c $< -o $(dot-target).tmp -MQ $@
    ifneq ($(CONFIG_CC_IS_CLANG)$(call clang-ifversion,-lt,600,y),yy)
    + rel-path = $(patsubst $(abs_srctree)/%,%,$(call realpath,$(1)))
    cmd_objcopy_fix_sym = \
    - $(OBJCOPY) --redefine-sym $(<F)=$< $(dot-target).tmp $@ && rm -f $(dot-target).tmp
    + $(OBJCOPY) --redefine-sym $(<F)=$(call rel-path,$<) $(dot-target).tmp $@ && rm -f $(dot-target).tmp
    else
    cmd_objcopy_fix_sym = mv -f $(dot-target).tmp $@
    endif
    @@ -272,6 +273,9 @@
    quiet_cmd_cpp_i_c = CPP $@
    cmd_cpp_i_c = $(CPP) $(call cpp_flags,$(c_flags)) -MQ $@ -o $@ $<

    +quiet_cmd_cpp_i_S = CPP $@
    +cmd_cpp_i_S = $(CPP) $(call cpp_flags,$(a_flags)) -MQ $@ -o $@ $<
    +
    quiet_cmd_cc_s_c = CC $@
    cmd