summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Lock <nox@jelal.kn-bremen.de>2009-11-20 23:37:57 +0100
committerBlue Swirl <blauwirbel@gmail.com>2009-11-21 09:32:23 +0000
commitdd4239d6574ca41c94fc0d0f77ddc728510ffc57 (patch)
tree6df6718cd87a6618428c22f08c21a8dc8646ab5d /pc-bios
parentAvoid segfault on net_tap_init() failure (diff)
downloadqemu-kvm-dd4239d6574ca41c94fc0d0f77ddc728510ffc57.tar.gz
qemu-kvm-dd4239d6574ca41c94fc0d0f77ddc728510ffc57.tar.bz2
qemu-kvm-dd4239d6574ca41c94fc0d0f77ddc728510ffc57.zip
Allow build of linuxboot.S with old assemblers
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> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/optionrom/optionrom.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/pc-bios/optionrom/optionrom.h b/pc-bios/optionrom/optionrom.h
index 34d69af89..4dcb90645 100644
--- 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; \