From: Sean Bruno <sbruno@freebsd.org>
To: qemu-devel@nongnu.org
Cc: markmb@redhat.com, rjones@redhat.com, pbonzini@redhat.com,
Sean Bruno <sbruno@freebsd.org>
Subject: [Qemu-devel] [PATCH] Unbreak build after optionrom update.
Date: Mon, 25 Jul 2016 11:57:46 -0600 [thread overview]
Message-ID: <20160725175746.97029-1-sbruno@freebsd.org> (raw)
Update the build flags appropriately for FreeBSD and add the correct
LD_EMULATION type for the FreeBSD build case.
Signed-off-by: Sean Bruno <sbruno@freebsd.org>
---
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
next reply other threads:[~2016-07-25 17:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-25 17:57 Sean Bruno [this message]
2016-07-25 18:53 ` [Qemu-devel] [PATCH] Unbreak build after optionrom update Peter Maydell
2016-07-25 19:00 ` Sean Bruno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160725175746.97029-1-sbruno@freebsd.org \
--to=sbruno@freebsd.org \
--cc=markmb@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rjones@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).