> Update the build flags appropriately for FreeBSD and add the correct > LD_EMULATION type for the FreeBSD build case. > > Signed-off-by: Sean Bruno <sbr...@freebsd.org>
I posted the right fix a couple days ago, but didn't manage to send a pull request before leaving and I am on mobile until next Monday. Search the archive for cc-c-option to get the right fix. Also, the commit message for a build fix patch really should include the error message, so please do that even if your v3 only includes the change to the emulation name. Thanks, Paolo > --- > pc-bios/optionrom/Makefile | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile > index d88ce11..5cf7c93 100644 > --- a/pc-bios/optionrom/Makefile > +++ b/pc-bios/optionrom/Makefile > @@ -28,7 +28,11 @@ endif > CFLAGS := $(filter -O% -g%, $(CFLAGS)) > QEMU_INCLUDES += -I$(SRC_PATH) > > +ifdef CONFIG_BSD > +Wa = -Wa > +else > Wa = -Wa, > +endif > ASFLAGS += -32 > QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), $(Wa)-32) > > @@ -44,8 +48,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 >
