From patchwork Fri Nov 20 22:37:57 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Allow build of linuxboot.S with old assemblers
From: Juergen Lock <nox@jelal.kn-bremen.de>
X-Patchwork-Id: 38943
Message-Id: <20091120223757.GA16688@triton8.kn-bremen.de>
To: qemu-devel@nongnu.org
Date: Fri, 20 Nov 2009 23:37:57 +0100

In the spirit of ff56954baf9cfab5cbbe18d10b4a09e4a17f39a8, fix the
build of linuxboot.S with old as(1) (as found in some BSD base systems)
by emitting the bytes of the insn it doesn't like instead.

Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>


--- a/pc-bios/optionrom/optionrom.h
+++ b/pc-bios/optionrom/optionrom.h
@@ -66,7 +66,10 @@
 	outw		%ax, (%dx);			\
 	mov		$BIOS_CFG_IOPORT_DATA, %dx;	\
 	cld;						\
-	rep insb	(%dx), %es:(%edi);
+	/* old as(1) doesn't like this insn so emit the bytes instead: \
+	rep insb	(%dx), %es:(%edi);		\
+	*/						\
+	.dc.b		0x67,0xf3,0x6c
 
 #define OPTION_ROM_START					\
     .code16;						\