* [Qemu-devel] [PATCH v2] Unbreak FreeBSD build after optionrom update.
@ 2016-07-25 19:08 Sean Bruno
2016-07-26 9:32 ` [Qemu-devel] R: " Paolo Bonzini
0 siblings, 1 reply; 7+ messages in thread
From: Sean Bruno @ 2016-07-25 19:08 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, 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] R: [PATCH v2] Unbreak FreeBSD build after optionrom update.
2016-07-25 19:08 [Qemu-devel] [PATCH v2] Unbreak FreeBSD build after optionrom update Sean Bruno
@ 2016-07-26 9:32 ` Paolo Bonzini
2016-07-26 21:07 ` Sean Bruno
0 siblings, 1 reply; 7+ messages in thread
From: Paolo Bonzini @ 2016-07-26 9:32 UTC (permalink / raw)
To: Sean Bruno; +Cc: qemu-devel, markmb, rjones
> 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>
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
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] R: [PATCH v2] Unbreak FreeBSD build after optionrom update.
2016-07-26 9:32 ` [Qemu-devel] R: " Paolo Bonzini
@ 2016-07-26 21:07 ` Sean Bruno
2016-08-01 10:47 ` Paolo Bonzini
0 siblings, 1 reply; 7+ messages in thread
From: Sean Bruno @ 2016-07-26 21:07 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, markmb, rjones
[-- Attachment #1: Type: text/plain, Size: 861 bytes --]
On 07/26/16 03:32, Paolo Bonzini 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>
>
> 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
>
Paolo:
Thanks for the pointer to the right fix. Confirmed that your changes
DTRT for FreeBSD.
I still need the LD_EMULATION addition, which I have sent to the list as
a separate patch for review.
sean
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 603 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] R: [PATCH v2] Unbreak FreeBSD build after optionrom update.
2016-07-26 21:07 ` Sean Bruno
@ 2016-08-01 10:47 ` Paolo Bonzini
2016-08-06 20:59 ` Brad Smith
0 siblings, 1 reply; 7+ messages in thread
From: Paolo Bonzini @ 2016-08-01 10:47 UTC (permalink / raw)
To: Sean Bruno; +Cc: qemu-devel, markmb, rjones
On 26/07/2016 23:07, Sean Bruno wrote:
>
> Thanks for the pointer to the right fix. Confirmed that your changes
> DTRT for FreeBSD.
>
> I still need the LD_EMULATION addition, which I have sent to the list as
> a separate patch for review.
Great, thanks!
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] R: [PATCH v2] Unbreak FreeBSD build after optionrom update.
2016-08-01 10:47 ` Paolo Bonzini
@ 2016-08-06 20:59 ` Brad Smith
2016-08-08 16:12 ` Peter Maydell
2016-09-02 14:05 ` Peter Maydell
0 siblings, 2 replies; 7+ messages in thread
From: Brad Smith @ 2016-08-06 20:59 UTC (permalink / raw)
To: Paolo Bonzini, Sean Bruno; +Cc: markmb, qemu-devel, rjones
On 08/01/16 06:47, Paolo Bonzini wrote:
>
>
> On 26/07/2016 23:07, Sean Bruno wrote:
>>
>> Thanks for the pointer to the right fix. Confirmed that your changes
>> DTRT for FreeBSD.
>>
>> I still need the LD_EMULATION addition, which I have sent to the list as
>> a separate patch for review.
>
> Great, thanks!
>
> Paolo
This breaks the build on OpenBSD..
ld: unrecognised emulation mode: elf_i386_fbsd
Supported emulations: elf_x86_64_obsd elf_i386_obsd elf_i386
gmake[1]: *** [Makefile:55: multiboot.img] Error 1
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] R: [PATCH v2] Unbreak FreeBSD build after optionrom update.
2016-08-06 20:59 ` Brad Smith
@ 2016-08-08 16:12 ` Peter Maydell
2016-09-02 14:05 ` Peter Maydell
1 sibling, 0 replies; 7+ messages in thread
From: Peter Maydell @ 2016-08-08 16:12 UTC (permalink / raw)
To: Brad Smith
Cc: Paolo Bonzini, Sean Bruno, Marc Marí,
QEMU Developers, Richard W.M. Jones
On 6 August 2016 at 21:59, Brad Smith <brad@comstyle.com> wrote:
> This breaks the build on OpenBSD..
>
> ld: unrecognised emulation mode: elf_i386_fbsd
> Supported emulations: elf_x86_64_obsd elf_i386_obsd elf_i386
> gmake[1]: *** [Makefile:55: multiboot.img] Error 1
Sorry about that; I've just sent out a patch which I hope
will fix this, but which will need testing on the BSDs.
thanks
-- PMM
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] R: [PATCH v2] Unbreak FreeBSD build after optionrom update.
2016-08-06 20:59 ` Brad Smith
2016-08-08 16:12 ` Peter Maydell
@ 2016-09-02 14:05 ` Peter Maydell
1 sibling, 0 replies; 7+ messages in thread
From: Peter Maydell @ 2016-09-02 14:05 UTC (permalink / raw)
To: Brad Smith
Cc: Paolo Bonzini, Sean Bruno, Marc Marí,
QEMU Developers, Richard W.M. Jones
On 6 August 2016 at 21:59, Brad Smith <brad@comstyle.com> wrote:
> This breaks the build on OpenBSD..
>
> ld: unrecognised emulation mode: elf_i386_fbsd
> Supported emulations: elf_x86_64_obsd elf_i386_obsd elf_i386
> gmake[1]: *** [Makefile:55: multiboot.img] Error 1
I'm looking at adding some BSD build tests to my set,
using the VMs in the GCC compile farm. However for
OpenBSD the compile farm has an OpenBSD 5.0 which fails
configure:
ERROR: Your compiler does not support the __thread specifier for
Thread-Local Storage (TLS). Please upgrade to a version that does.
Is this just too old an OpenBSD?
thanks
-- PMM
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-09-02 14:06 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-25 19:08 [Qemu-devel] [PATCH v2] Unbreak FreeBSD build after optionrom update Sean Bruno
2016-07-26 9:32 ` [Qemu-devel] R: " Paolo Bonzini
2016-07-26 21:07 ` Sean Bruno
2016-08-01 10:47 ` Paolo Bonzini
2016-08-06 20:59 ` Brad Smith
2016-08-08 16:12 ` Peter Maydell
2016-09-02 14:05 ` 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.