From patchwork Tue Jul 26 21:05:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Bruno X-Patchwork-Id: 9248955 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B5518607F2 for ; Tue, 26 Jul 2016 21:06:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A434D209CD for ; Tue, 26 Jul 2016 21:06:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98D8D2723E; Tue, 26 Jul 2016 21:06:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AAF23209CD for ; Tue, 26 Jul 2016 21:06:06 +0000 (UTC) Received: from localhost ([::1]:42246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS9YD-0005So-CI for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jul 2016 17:06:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS9Xu-0005Se-He for qemu-devel@nongnu.org; Tue, 26 Jul 2016 17:05:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bS9Xq-0007sH-NA for qemu-devel@nongnu.org; Tue, 26 Jul 2016 17:05:45 -0400 Received: from ignoranthack.me ([199.102.79.106]:51132 helo=mail.ignoranthack.me) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS9Xq-0007sD-Gx for qemu-devel@nongnu.org; Tue, 26 Jul 2016 17:05:42 -0400 Received: from bruno.llnw.corp.root (67-0-51-151.albq.qwest.net [67.0.51.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sbruno@ignoranthack.me) by mail.ignoranthack.me (Postfix) with ESMTPSA id B005E1928CE; Tue, 26 Jul 2016 21:05:38 +0000 (UTC) From: Sean Bruno To: qemu-devel@nongnu.org Date: Tue, 26 Jul 2016 15:05:33 -0600 Message-Id: <20160726210533.20116-1-sbruno@freebsd.org> X-Mailer: git-send-email 2.8.4 X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 199.102.79.106 Subject: [Qemu-devel] [PATCH] Unbreak FreeBSD build after optionrom update. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, markmb@redhat.com, rjones@redhat.com, Sean Bruno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Update the build flags appropriately for FreeBSD and add the correct LD_EMULATION type for the FreeBSD build case. Fixes FreeBSD build error: ld: unrecognised emulation mode: elf_i386 Supported emulations: elf_x86_64_fbsd elf_i386_fbsd gmake[1]: *** [Makefile:51: linuxboot_dma.img] Error 1 gmake: *** [Makefile:229: romsubdir-optionrom] Error 2 Signed-off-by: Sean Bruno --- pc-bios/optionrom/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index d88ce11..8c8d7cd 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -44,8 +44,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)$@")