From 2ef45cea50771acdda79f97fa6f69431f6e4d0fb Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Sat, 2 Apr 2011 16:09:21 +0100 Subject: [PATCH] xen: fix reloc.S generation for non-gnu toolchain The output of AT&T UNIX and GNU od(1) are different. Signed-off-by: Christoph Egger xen-unstable changeset: 23130:0e88c781a8a8 xen-unstable date: Sat Apr 02 15:53:35 2011 +0100 --- xen/arch/x86/boot/build32.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index c061560bdf..19c813de76 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -9,8 +9,8 @@ CFLAGS += -Werror -fno-builtin -msoft-float # NB. awk invocation is a portable alternative to 'head -n -1' %.S: %.bin - (od -v -t x $< | awk 'NR > 1 {print s} {s=$$0}' | \ - sed 's/ /,0x/g' | sed 's/^[0-9]*,/ .long /') >$@ + (od -v -t x $< | tr -s ' ' | awk 'NR > 1 {print s} {s=$$0}' | \ + sed 's/ /,0x/g' | sed 's/,0x$$//' | sed 's/^[0-9]*,/ .long /') >$@ %.bin: %.lnk $(OBJCOPY) -O binary $< $@ -- 2.39.5