| Message ID | 5fcb47ec-4a0e-99a2-c548-f42ec1cc8030@suse.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | build: corrections to .init.o generation logic | expand |
On 06/08/2020 10:05, Jan Beulich wrote: > The originally used sed expression converted not just multiple leading > zeroes (as intended), but also trailing ones, rendering the error > message somewhat confusing. Collapse zeroes in just the one place where > we need them collapsed, and leave objdump's output as is for all other > purposes. > > Fixes: 48115d14743e ("Move more kernel decompression bits to .init.* sections") > Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -185,11 +185,11 @@ cmd_cc_o_S = $(CC) $(a_flags) -c $< -o $ quiet_cmd_obj_init_o = INIT_O $@ define cmd_obj_init_o - $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p;}' | while read idx name sz rest; do \ + $(OBJDUMP) -h $< | while read idx name sz rest; do \ case "$$name" in \ .*.local) ;; \ .text|.text.*|.data|.data.*|.bss) \ - test $$sz != 0 || continue; \ + test $$(echo $$sz | sed 's,00*,0,') != 0 || continue; \ echo "Error: size of $<:$$name is 0x$$sz" >&2; \ exit $$(expr $$idx + 1);; \ esac; \
The originally used sed expression converted not just multiple leading zeroes (as intended), but also trailing ones, rendering the error message somewhat confusing. Collapse zeroes in just the one place where we need them collapsed, and leave objdump's output as is for all other purposes. Fixes: 48115d14743e ("Move more kernel decompression bits to .init.* sections") Signed-off-by: Jan Beulich <jbeulich@suse.com>