diff options
| author | Sean Bruno <sbruno@freebsd.org> | 2016-07-26 15:05:33 -0600 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-29 14:25:35 +0100 |
| commit | cf4b61d5819da0b307502527c01d935bf07c9b38 (patch) | |
| tree | bfa1f86a5c882249114166301be11c2879de017d | |
| parent | 036999e93e4913e29cd5fd751750677074e8747e (diff) | |
Unbreak FreeBSD build after optionrom update.
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>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | pc-bios/optionrom/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 72abb3c9a0..24e175e0eb 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)$@") |