* [Qemu-devel] [PATCH] Unbreak FreeBSD build after optionrom update.
@ 2016-07-26 21:05 Sean Bruno
2016-07-29 13:53 ` Peter Maydell
0 siblings, 1 reply; 2+ messages in thread
From: Sean Bruno @ 2016-07-26 21:05 UTC (permalink / raw)
To: qemu-devel; +Cc: markmb, rjones, pbonzini, Sean Bruno
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 <sbruno@freebsd.org>
---
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)$@")
--
2.8.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] Unbreak FreeBSD build after optionrom update.
2016-07-26 21:05 [Qemu-devel] [PATCH] Unbreak FreeBSD build after optionrom update Sean Bruno
@ 2016-07-29 13:53 ` Peter Maydell
0 siblings, 0 replies; 2+ messages in thread
From: Peter Maydell @ 2016-07-29 13:53 UTC (permalink / raw)
To: Sean Bruno
Cc: QEMU Developers, Paolo Bonzini, Marc Marí, Richard W.M. Jones
On 26 July 2016 at 22:05, Sean Bruno <sbruno@freebsd.org> wrote:
> 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 <sbruno@freebsd.org>
> ---
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-29 13:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-26 21:05 [Qemu-devel] [PATCH] Unbreak FreeBSD build after optionrom update Sean Bruno
2016-07-29 13:53 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.