From a192def39ee9a44cb8c05f8367240a7acf17539a Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Wed, 4 Oct 2023 23:09:25 -0500 Subject: user/qemu: patch unsupported ld flag. fixes #1075. --- user/qemu/fix-no-pie-ld-flag.patch | 71 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 user/qemu/fix-no-pie-ld-flag.patch (limited to 'user/qemu/fix-no-pie-ld-flag.patch') diff --git a/user/qemu/fix-no-pie-ld-flag.patch b/user/qemu/fix-no-pie-ld-flag.patch new file mode 100644 index 000000000..5501a267f --- /dev/null +++ b/user/qemu/fix-no-pie-ld-flag.patch @@ -0,0 +1,71 @@ +This patch differs from upstream in the following way: + + * It applies to 4.2.0 + +From bbd2d5a8120771ec59b86a80a1f51884e0a26e53 Mon Sep 17 00:00:00 2001 +From: Christian Ehrhardt +Date: Mon, 14 Dec 2020 16:09:38 +0100 +Subject: [PATCH] build: -no-pie is no functional linker flag + +Recent binutils changes dropping unsupported options [1] caused a build +issue in regard to the optionroms. + + ld -m elf_i386 -T /<>/pc-bios/optionrom//flat.lds -no-pie \ + -s -o multiboot.img multiboot.o + ld.bfd: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?) + +This isn't really a regression in ld.bfd, filing the bug upstream +revealed that this never worked as a ld flag [2] - in fact it seems we +were by accident setting --nmagic). + +Since it never had the wanted effect this usage of LDFLAGS_NOPIE, should be +droppable without any effect. This also is the only use-case of LDFLAGS_NOPIE +in .mak, therefore we can also remove it from being added there. + +[1]: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=983d925d +[2]: https://sourceware.org/bugzilla/show_bug.cgi?id=27050#c5 + +Signed-off-by: Christian Ehrhardt +Message-Id: <20201214150938.1297512-1-christian.ehrhardt@canonical.com> +Cc: qemu-stable@nongnu.org +Signed-off-by: Paolo Bonzini +--- + configure | 3 --- + pc-bios/optionrom/Makefile | 1 - + 2 files changed, 4 deletions(-) + +diff -ur a/configure b/configure +--- a/configure 2023-10-05 04:04:33.203940722 +0000 ++++ b/configure 2023-10-05 04:04:58.968996416 +0000 +@@ -2045,7 +2045,6 @@ + # check we support --no-pie first... + if compile_prog "-Werror -fno-pie" "-no-pie"; then + CFLAGS_NOPIE="-fno-pie" +- LDFLAGS_NOPIE="-nopie" + fi + + if compile_prog "-fPIE -DPIE" "-pie"; then +@@ -7515,7 +7514,6 @@ + echo "QEMU_CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak + fi + echo "LDFLAGS=$LDFLAGS" >> $config_host_mak +-echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak + echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak + echo "LD_REL_FLAGS=$LD_REL_FLAGS" >> $config_host_mak + echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak +diff -ur a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile +--- a/pc-bios/optionrom/Makefile 2023-10-05 04:04:34.143979321 +0000 ++++ b/pc-bios/optionrom/Makefile 2023-10-05 04:06:01.267530732 +0000 +@@ -47,10 +47,10 @@ + $(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$(TARGET_DIR)$@") + + pvh.img: pvh.o pvh_main.o +- $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $^,"BUILD","$(TARGET_DIR)$@") ++ $(call quiet-command,$(LD) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $^,"BUILD","$(TARGET_DIR)$@") + + %.img: %.o +- $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $<,"BUILD","$(TARGET_DIR)$@") ++ $(call quiet-command,$(LD) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $<,"BUILD","$(TARGET_DIR)$@") + + %.raw: %.img + $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$(TARGET_DIR)$@") -- cgit v1.2.3-60-g2f50