[Xen-changelog] [xen-unstable] xen: fix reloc.S generation for non-gnu toolchain

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Christoph Egger <Christoph.Egger@xxxxxxx>
# Date 1301756015 -3600
# Node ID 0e88c781a8a8ac121b2bfaba2e5bed3e94570c16
# Parent  219ba19aedeb185beae1651cd2d136c077af1e76
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@xxxxxxx>
---


diff -r 219ba19aedeb -r 0e88c781a8a8 xen/arch/x86/boot/build32.mk
--- a/xen/arch/x86/boot/build32.mk      Sat Apr 02 15:50:47 2011 +0100
+++ b/xen/arch/x86/boot/build32.mk      Sat Apr 02 15:53:35 2011 +0100
@@ -9,8 +9,8 @@
 
 # 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 $< $@

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog