From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45909) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRk8b-0001Sp-F5 for qemu-devel@nongnu.org; Mon, 25 Jul 2016 13:57:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bRk8X-0001c6-79 for qemu-devel@nongnu.org; Mon, 25 Jul 2016 13:57:56 -0400 Received: from ignoranthack.me ([199.102.79.106]:53029 helo=mail.ignoranthack.me) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRk8X-0001bz-1V for qemu-devel@nongnu.org; Mon, 25 Jul 2016 13:57:53 -0400 From: Sean Bruno Date: Mon, 25 Jul 2016 11:57:46 -0600 Message-Id: <20160725175746.97029-1-sbruno@freebsd.org> Subject: [Qemu-devel] [PATCH] Unbreak build after optionrom update. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: markmb@redhat.com, rjones@redhat.com, pbonzini@redhat.com, Sean Bruno Update the build flags appropriately for FreeBSD and add the correct LD_EMULATION type for the FreeBSD build case. Signed-off-by: Sean Bruno --- pc-bios/optionrom/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index d88ce11..38ee31b 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -28,7 +28,9 @@ endif CFLAGS := $(filter -O% -g%, $(CFLAGS)) QEMU_INCLUDES += -I$(SRC_PATH) -Wa = -Wa, +ifndef CONFIG_BSD +Wa = -Wa +endif ASFLAGS += -32 QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), $(Wa)-32) @@ -44,8 +46,12 @@ build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin ifdef CONFIG_WIN32 LD_EMULATION = i386pe else +ifdef CONFIG_BSD +LD_EMULATION = elf_i386_fbsd +else LD_EMULATION = elf_i386 endif +endif %.img: %.o $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_EMULATION) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") -- 2.8.4