From: Christoph Egger <Christoph.Egger@amd.com>
Date: Sat, 2 Apr 2011 15:06:45 +0000 (+0100)
Subject: xen: fix reloc.S generation for non-gnu toolchain
X-Git-Tag: 4.1.1-rc1~43
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6f2fb17667dee92c199c71970f5e81c440f3849f;p=people%2Fvhanquez%2Fxen.git

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 <Christoph.Egger@amd.com>
xen-unstable changeset:   23130:0e88c781a8a8
xen-unstable date:        Sat Apr 02 15:53:35 2011 +0100
---

diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk
index 1364d3b50..2d2cfb15a 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 $< $@