* [Qemu-devel] [PATCH] Unbreak build after optionrom update.
@ 2016-07-25 17:57 Sean Bruno
2016-07-25 18:53 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Sean Bruno @ 2016-07-25 17:57 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.
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] Unbreak build after optionrom update.
2016-07-25 17:57 [Qemu-devel] [PATCH] Unbreak build after optionrom update Sean Bruno
@ 2016-07-25 18:53 ` Peter Maydell
2016-07-25 19:00 ` Sean Bruno
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2016-07-25 18:53 UTC (permalink / raw)
To: Sean Bruno
Cc: QEMU Developers, Paolo Bonzini, Marc Marí,
Richard W.M. Jones
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] Unbreak build after optionrom update.
2016-07-25 18:53 ` Peter Maydell
@ 2016-07-25 19:00 ` Sean Bruno
0 siblings, 0 replies; 3+ messages in thread
From: Sean Bruno @ 2016-07-25 19:00 UTC (permalink / raw)
To: Peter Maydell
Cc: QEMU Developers, Paolo Bonzini, Marc Marí,
Richard W.M. Jones
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-25 19:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-25 17:57 [Qemu-devel] [PATCH] Unbreak build after optionrom update Sean Bruno
2016-07-25 18:53 ` Peter Maydell
2016-07-25 19:00 ` Sean Bruno
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).