1 files changed, 0 insertions, 43 deletions
diff --git a/no-ld-no-pie.patch b/no-ld-no-pie.patch
deleted file mode 100644
index c858154d6199..000000000000
--- a/no-ld-no-pie.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur orig.xen-4.15.0/tools/qemu-xen/configure xen-4.15.0/tools/qemu-xen/configure
---- orig.xen-4.15.0/tools/qemu-xen/configure	2021-04-14 21:21:12.452569711 -0700
-+++ xen-4.15.0/tools/qemu-xen/configure	2021-04-15 00:28:33.297563599 -0700
-@@ -2184,7 +2184,6 @@
- # Check we support --no-pie first; we will need this for building ROMs.
- if compile_prog "-Werror -fno-pie" "-no-pie"; then
-   CFLAGS_NOPIE="-fno-pie"
--  LDFLAGS_NOPIE="-no-pie"
- fi
- 
- if test "$static" = "yes"; then
-@@ -2200,7 +2199,6 @@
-   fi
- elif test "$pie" = "no"; then
-   QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
--  QEMU_LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS"
- elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
-   QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
-   QEMU_LDFLAGS="-pie $QEMU_LDFLAGS"
-@@ -7996,7 +7994,6 @@
-   echo "QEMU_CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
- fi
- echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
--echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
- echo "LD_REL_FLAGS=$LD_REL_FLAGS" >> $config_host_mak
- echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
- echo "LIBS+=$LIBS" >> $config_host_mak
-diff -Naur orig.xen-4.15.0/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.15.0/tools/qemu-xen/pc-bios/optionrom/Makefile
---- orig.xen-4.15.0/tools/qemu-xen/pc-bios/optionrom/Makefile	2021-04-14 21:22:40.942571012 -0700
-+++ xen-4.15.0/tools/qemu-xen/pc-bios/optionrom/Makefile	2021-04-15 00:29:15.334688505 -0700
-@@ -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)$@")