Commit 46eef33b authored by Brad's avatar Brad Committed by Peter Maydell
Browse files

Fix QEMU build on OpenBSD on x86 archs 



This resolves the build issue with building the ROMs on OpenBSD on x86 archs.
As of OpenBSD 5.3 the compiler builds PIE binaries by default and thus the
whole OS/packages and so forth. The ROMs need to have PIE disabled.
Check in configure whether the compiler supports the flags for disabling
PIE, and if it does then use them for building the ROMs. This fixes the
following buildbot failure:

>From the OpenBSD buildbots..
  Building optionrom/multiboot.img
ld: multiboot.o: relocation R_X86_64_16 can not be used when making a shared object; recompile with -fPIC

Signed-off by: Brad Smith <brad@comstyle.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 0dbcf95a

configure

+7 −0
Original line number Diff line number Diff line
@@ -1392,6 +1392,11 @@ EOF 
      pie="no"

    fi

  fi



  if compile_prog "-fno-pie" "-nopie"; then

    CFLAGS_NOPIE="-fno-pie"

    LDFLAGS_NOPIE="-nopie"

  fi

fi



##########################################
@@ -4378,6 +4383,7 @@ echo "LD=$ld" >> $config_host_mak 
echo "WINDRES=$windres" >> $config_host_mak

echo "LIBTOOL=$libtool" >> $config_host_mak

echo "CFLAGS=$CFLAGS" >> $config_host_mak

echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak

echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak

echo "QEMU_INCLUDES=$QEMU_INCLUDES" >> $config_host_mak

if test "$sparse" = "yes" ; then
@@ -4391,6 +4397,7 @@ else 
  echo "AUTOCONF_HOST := "                             >> $config_host_mak

fi

echo "LDFLAGS=$LDFLAGS" >> $config_host_mak

echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak

echo "LIBTOOLFLAGS=$LIBTOOLFLAGS" >> $config_host_mak

echo "LIBS+=$LIBS" >> $config_host_mak

echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak

pc-bios/optionrom/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/optionrom) 
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
@@ -20,7 +21,7 @@ build-all: multiboot.bin linuxboot.bin kvmvapic.bin 
.SECONDARY:



%.img: %.o

	$(call quiet-command,$(LD) -Ttext 0 -e _start -s -o $@ $<,"  Building $(TARGET_DIR)$@")

	$(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -Ttext 0 -e _start -s -o $@ $<,"  Building $(TARGET_DIR)$@")



%.raw: %.img

	$(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"  Building $(TARGET_DIR)$@")