From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54645)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1bRyjR-0006M9-RW
	for qemu-devel@nongnu.org; Tue, 26 Jul 2016 05:32:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1bRyjN-00019r-NJ
	for qemu-devel@nongnu.org; Tue, 26 Jul 2016 05:32:56 -0400
Received: from mx4-phx2.redhat.com ([209.132.183.25]:40123)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1bRyjN-00019d-Et
	for qemu-devel@nongnu.org; Tue, 26 Jul 2016 05:32:53 -0400
Date: Tue, 26 Jul 2016 05:32:48 -0400 (EDT)
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <760741756.10662159.1469525568142.JavaMail.zimbra@redhat.com>
In-Reply-To: <20160725190842.2348-1-sbruno@freebsd.org>
References: <20160725190842.2348-1-sbruno@freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] R: [PATCH v2] Unbreak FreeBSD build after optionrom
 update.
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Sean Bruno <sbruno@freebsd.org>
Cc: qemu-devel@nongnu.org, markmb@redhat.com, rjones@redhat.com


> 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
>