[Qemu-devel] [PATCH] Unbreak build after optionrom update.

[Qemu-devel] [PATCH] Unbreak build after optionrom update.

[Sean Bruno]

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

Re: [Qemu-devel] [PATCH] Unbreak build after optionrom update.

[Peter Maydell]

On 25 July 2016 at 18:57, 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.
>
> 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

For non-BSD this used to be "-Wa," and now it is just "-Wa"...

thanks
-- PMM

Re: [Qemu-devel] [PATCH] Unbreak build after optionrom update.

[Sean Bruno]

[-- Attachment #1: Type: text/plain, Size: 933 bytes --]



On 07/25/16 12:53, Peter Maydell wrote:
> On 25 July 2016 at 18:57, 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.
>>
>> 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
> 
> For non-BSD this used to be "-Wa," and now it is just "-Wa"...
> 
> thanks
> -- PMM
> 

Bah ... got happy with the "yyp" in vi.  One sec, let me unbreak.

sean


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 603 bytes --]