From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Egger Subject: [PATCH] xen: fix reloc.S generation Date: Thu, 31 Mar 2011 11:23:27 +0100 Message-ID: <201103311223.29863.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_hYFlNaCWf8L3T7F" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" , Keir Fraser List-Id: xen-devel@lists.xenproject.org --Boundary-00=_hYFlNaCWf8L3T7F Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, attached patch fixes generation of reloc.S and makes xen boot out-of-the box since c/s 19146. The output of AT&T UNIX and GNU od(1) are different. Please apply this to Xen 4.1, 4.0 and 3.4. Signed-off-by: Christoph Egger -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_hYFlNaCWf8L3T7F Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_boot.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_boot.diff" Content-Description: xen_boot.diff diff -r cebd5d3f0ec4 xen/arch/x86/boot/build32.mk --- a/xen/arch/x86/boot/build32.mk Fri Mar 25 11:29:24 2011 +0100 +++ b/xen/arch/x86/boot/build32.mk Thu Mar 31 12:13:22 2011 +0200 @@ -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 $< $@ --Boundary-00=_hYFlNaCWf8L3T7F Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_hYFlNaCWf8L3T7F--