aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Egger <Christoph.Egger@amd.com>2011-04-02 16:06:45 +0100
committerChristoph Egger <Christoph.Egger@amd.com>2011-04-02 16:06:45 +0100
commitc5acb1ae35409d705390da969af0e8860c9b2ab7 (patch)
treebc52d34afabcbfb2e2e2097573cd9ffc300d3c7b
parent78134e0480c642b82a2b753dd26fc4b848331c16 (diff)
downloadxen-c5acb1ae35409d705390da969af0e8860c9b2ab7.tar.gz
xen-c5acb1ae35409d705390da969af0e8860c9b2ab7.tar.bz2
xen-c5acb1ae35409d705390da969af0e8860c9b2ab7.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> xen-unstable changeset: 23130:0e88c781a8a8 xen-unstable date: Sat Apr 02 15:53:35 2011 +0100
-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 1364d3b509..2d2cfb15aa 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 $< $@