Skip to contentSkip to conversation

Fix QEMU build on OpenBSD on x86 archs

PATCH Superseded Brad Smith 2 participants 3 messages Nov 27, 2013 – Dec 9, 2013

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Brad Smith

author
#0 lore raw

PATCH 1/1 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. This is my initial attempt at trying to get somehting upstream so that QEMU both builds out of the box and to resolve the build issue with the buildbots that has been around for awhile. We have a patch in our ports tree but it is just the flags hardcoded into the Makefile which obviously is not appropriate for upstream.

Quoted 1 line

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 <[email protected]>

configure +6 -0
index 508f6a5..6d84885 100755
@@ -1342,6 +1342,10 @@ EOF
   if compile_prog "-fPIE -DPIE" "-pie"; then
     QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
     LDFLAGS="-pie $LDFLAGS"
+    if test "$targetos" = OpenBSD; then
+      CC_NOPIE="-fno-pie"
+      LD_NOPIE="-nopie"
+    fi
     pie="yes"
     if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then
       LDFLAGS="-Wl,-z,relro -Wl,-z,now $LDFLAGS"
@@ -4307,6 +4311,8 @@ if test "$gcov" = "yes" ; then
   echo "CONFIG_GCOV=y" >> $config_host_mak
   echo "GCOV=$gcov_tool" >> $config_host_mak
 fi
+echo "CC_NOPIE=$CC_NOPIE" >> $config_host_mak
+echo "LD_NOPIE=$LD_NOPIE" >> $config_host_mak
 
 # use included Linux headers
 if test "$linux" = "yes" ; then
pc-bios/optionrom/Makefile +2 -1
index 57d8bd0..0b35000 100644
@@ -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 += $(CC_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) $(LD_NOPIE) -Ttext 0 -e _start -s -o $@ $<,"  Building $(TARGET_DIR)$@")
 
 %.raw: %.img
 	$(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"  Building $(TARGET_DIR)$@")
Signature · 3 lines
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
author
#1 lore raw
Quoted 9 lines · Brad Smith

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. This is my initial attempt at trying to get somehting upstream so that QEMU both builds out of the box and to resolve the build issue with the buildbots that has been around for awhile. We have a patch in our ports tree but it is just the flags hardcoded into the Makefile which obviously is not appropriate for upstream.

Quoted 6 lines

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 <[email protected]>

ping.

Quoted 46 lines
configure +6 -0
index 508f6a5..6d84885 100755
@@ -1342,6 +1342,10 @@ EOF
    if compile_prog "-fPIE -DPIE" "-pie"; then
      QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
      LDFLAGS="-pie $LDFLAGS"
+    if test "$targetos" = OpenBSD; then
+      CC_NOPIE="-fno-pie"
+      LD_NOPIE="-nopie"
+    fi
      pie="yes"
      if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then
        LDFLAGS="-Wl,-z,relro -Wl,-z,now $LDFLAGS"
@@ -4307,6 +4311,8 @@ if test "$gcov" = "yes" ; then
    echo "CONFIG_GCOV=y" >> $config_host_mak
    echo "GCOV=$gcov_tool" >> $config_host_mak
  fi
+echo "CC_NOPIE=$CC_NOPIE" >> $config_host_mak
+echo "LD_NOPIE=$LD_NOPIE" >> $config_host_mak
 
  # use included Linux headers
  if test "$linux" = "yes" ; then
pc-bios/optionrom/Makefile +2 -1
index 57d8bd0..0b35000 100644
@@ -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 += $(CC_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) $(LD_NOPIE) -Ttext 0 -e _start -s -o $@ $<,"  Building $(TARGET_DIR)$@")
 
  %.raw: %.img
  	$(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"  Building $(TARGET_DIR)$@")
Signature · 3 lines
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
#2 lore raw

Please repost a proper v2.

Regards,

Anthony Liguori

Quoted 82 lines · Brad Smith
Quoted 11 lines · Brad Smith

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. This is my initial attempt at trying to get somehting upstream so that QEMU both builds out of the box and to resolve the build issue with the buildbots that has been around for awhile. We have a patch in our ports tree but it is just the flags hardcoded into the Makefile which obviously is not appropriate for upstream.

Quoted 7 lines

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 <[email protected]>

ping.

Quoted 47 lines
configure +6 -0
index 508f6a5..6d84885 100755
@@ -1342,6 +1342,10 @@ EOF
    if compile_prog "-fPIE -DPIE" "-pie"; then
      QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
      LDFLAGS="-pie $LDFLAGS"
+    if test "$targetos" = OpenBSD; then
+      CC_NOPIE="-fno-pie"
+      LD_NOPIE="-nopie"
+    fi
      pie="yes"
      if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then
        LDFLAGS="-Wl,-z,relro -Wl,-z,now $LDFLAGS"
@@ -4307,6 +4311,8 @@ if test "$gcov" = "yes" ; then
    echo "CONFIG_GCOV=y" >> $config_host_mak
    echo "GCOV=$gcov_tool" >> $config_host_mak
  fi
+echo "CC_NOPIE=$CC_NOPIE" >> $config_host_mak
+echo "LD_NOPIE=$LD_NOPIE" >> $config_host_mak
 
  # use included Linux headers
  if test "$linux" = "yes" ; then
pc-bios/optionrom/Makefile +2 -2
index 57d8bd0..0b35000 100644
@@ -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 += $(CC_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) $(LD_NOPIE) -Ttext 0 -e _start -s -o $@
 $<,"  Building $(TARGET_DIR)$@")
 

%.raw: %.img

Quoted 3 lines
        $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"

Building $(TARGET_DIR)$@")

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.