From 3b428e9512d341b9678a98c032256ae770daed47 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 31 May 2017 14:37:15 +0200 Subject: [PATCH] linuxboot_dma: compile for i486 The ROM uses the cmovne instruction, which is new in Pentium Pro and does not work when running QEMU with "-cpu 486". Avoid producing that instruction. Suggested-by: Richard W.M. Jones Suggested-by: Thomas Huth Reported-by: Rob Landley Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit 7e018385103cd7a571b9ea0d6f994af6b1129fe7) Signed-off-by: Michael Roth --- pc-bios/linuxboot_dma.bin | Bin 1536 -> 1536 bytes pc-bios/optionrom/Makefile | 1 + 2 files changed, 1 insertion(+) diff --git a/pc-bios/linuxboot_dma.bin b/pc-bios/linuxboot_dma.bin index 218d3ab4a29bfb5ab7125ec7a4d29dad1860c673..d176f62797813e4b926dca9dfce7ce554dc1a4d6 100644 GIT binary patch literal 1536 zc-rk!&ubGw7@gg2HN?QCHLXE%*uyG_BCH2R(1Q>UN+JQA=JynDvCl6VmE%X$=DqH5A1gszIpTJeLr~f&n8ycKcmFV z+G0&n<^2ph_xEisJujcH&a=v`#rl2Y&eDyW3wMojRd9a&?muQthc#a^hAVKtIcMgecPOct8lq1``v7+(OC-VyCj6fG5*8;(=bMd&W{SJpOPtx} zbC&9lqxBzfU*~ZRuQoGJMv>Mx@Is@$5YCE|RQbYSFp%H@CS;mrGY?)RoFprhheamk z`N<(nX~ealjn*Do%VE30&Z_FYDYWSM6vAUE2w#=TS*fgn|4eo&?vr={d_75}DYr2p zn1|SRVoI^bG`zNR6%RH9>|Da>u5$s_I$8=Bv%IIBy_xYk`Xf{EV%!bsHl^wri<5TGTCT4Y60Q&aMZNXi(`%Mm5pY=PmJLii5I~SCZm-V5l%@R;;Uo) z{gR&p|Gd3}7bIQ+kGDrUC4@6lhxp+T7k221^;3SG@FQz*H}k=}pdIuA9(3VK(&0M^%4@`NEg;cp4QcyT=^Z01M(w+VR^(MFy+ct{16ew?t~*p2@vw*CM{ Ca48S~ literal 1536 zc-rk!O=}ZD7@keHn#RCxYN|nUh%gpJFME=L9)#^JfmB;PR0KhvMUfUXrCxQ-VF_8p zpWz=cE(p8SgEc520kP^K*2@MfejLSSeP@y>9{dOPJ-jpX%rnpXG4Iloi8lME6&bIt zRJD{kpJnIw?iQtAn6E6c^39dCd!^f}*RJ2VQ?e_9^XvCuoi%H$`J6Fagx7<+W5Vhp z`fS2@3F8$W!)<3^Y{Fb1R8TAE4#L)=Pb8=Vc((B-4Pkaa5FQ)&_5B#YBUwO)+Oy0_$s=hJw>jT*U^>3yh~BCK<&=)Xxk)4cWf!+kbD`AAE@$ A5C8xG diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index fa53d9e58e9..a9a9e5e7ebc 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -13,6 +13,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/optionrom) ifeq ($(lastword $(filter -O%, -O0 $(CFLAGS))),-O0) override CFLAGS += -O2 endif +override CFLAGS += -march=i486 # Drop -fstack-protector and the like QEMU_CFLAGS := $(filter -W%, $(QEMU_CFLAGS)) $(CFLAGS_NOPIE) -ffreestanding -- 2.39.5