aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Egger <Christoph.Egger@amd.com>2011-04-02 16:09:21 +0100
committerChristoph Egger <Christoph.Egger@amd.com>2011-04-02 16:09:21 +0100
commit2ef45cea50771acdda79f97fa6f69431f6e4d0fb (patch)
tree76ea33e78a2d2b5c4b94d2448e349a6a2b21ee81
parentaae7f8f703f57f042431b4a74ee6ca6c9a36fd98 (diff)
downloadxen-2ef45cea50771acdda79f97fa6f69431f6e4d0fb.tar.gz
xen-2ef45cea50771acdda79f97fa6f69431f6e4d0fb.tar.bz2
xen-2ef45cea50771acdda79f97fa6f69431f6e4d0fb.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 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 $< $@