Re: [Qemu-devel] [PULL 1/1] Add optionrom compatible with fw_cfg DMA version

[Brad Smith]

On 08/08/16 04:50, Paolo Bonzini wrote:
> On 07/08/2016 01:53, Brad Smith wrote:
> > On 07/14/16 09:52, Paolo Bonzini wrote:
> > > diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
> > > index 2cdda87..d88ce11 100644
> > > --- a/pc-bios/optionrom/Makefile
> > > +++ b/pc-bios/optionrom/Makefile
> > > @@ -9,22 +9,46 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/optionrom)
> > >
> > >  .PHONY : all clean build-all
> > >
> > > -CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer
> > > -fno-builtin
> > > -CFLAGS += -I$(SRC_PATH)
> > > -CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
> > > -CFLAGS += $(CFLAGS_NOPIE)
> > > -QEMU_CFLAGS = $(CFLAGS)
> > > -
> > > -build-all: multiboot.bin linuxboot.bin kvmvapic.bin
> > > +# Drop -fstack-protector and the like
> > > +QEMU_CFLAGS := $(filter -W%, $(QEMU_CFLAGS)) $(CFLAGS_NOPIE)
> > > -ffreestanding
> > > +QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -m16)
> >
> > This change in CFLAGS handling broke the build on OpenBSD. Filtering
> > -fstack-protector is not enough and is why the Makefile had an explicit
> > -fno-stack-protector provided.
> >
> > Adding this back in fixes the issue..
> >
> > QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -fno-stack-protector)
>
> Ok, will add back.

Great, thank you.