aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/boot
diff options
context:
space:
mode:
authorChristoph Egger <Christoph.Egger@amd.com>2011-04-02 15:53:35 +0100
committerChristoph Egger <Christoph.Egger@amd.com>2011-04-02 15:53:35 +0100
commitfb22c75f1660d8a612af09828bf929334818003d (patch)
tree639ba7c1bdd6dae813b108f8474003b2a9632d31 /xen/arch/x86/boot
parent7122101c35b4ab4c8f702811be37796d2450f8ec (diff)
downloadxen-fb22c75f1660d8a612af09828bf929334818003d.tar.gz
xen-fb22c75f1660d8a612af09828bf929334818003d.tar.bz2
xen-fb22c75f1660d8a612af09828bf929334818003d.zip
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>
Diffstat (limited to 'xen/arch/x86/boot')
-rw-r--r--xen/arch/x86/boot/build32.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk
index 447033afd2..185f9452d2 100644
--- a/xen/arch/x86/boot/build32.mk
+++ b/xen/arch/x86/boot/build32.mk
@@ -9,8 +9,8 @@ CFLAGS := $(filter-out -flto,$(CFLAGS))
# 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 $< $@