File seabios.699a4e5d6919cc8eae5342443025ceb6909dc276.patch of Package xen
From: Kevin O'Connor <kevin@koconnor.net>
Date: Wed, 22 Jul 2020 11:31:40 -0400
Subject: 699a4e5d6919cc8eae5342443025ceb6909dc276
ldnoexec: Add script to remove ET_EXEC flag from intermediate build objects
Add a script to remove the ET_EXEC flag from the 16bit and "32bit
segmented" intermediate objects. This avoids build failures with some
linkers that will not allow linking these objects again.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
Makefile | 9 +++++----
scripts/ldnoexec.py | 32 ++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 4 deletions(-)
create mode 100755 scripts/ldnoexec.py
--- a/Makefile
+++ b/Makefile
@@ -113,27 +113,28 @@ endif
ifeq "$(TESTGCC)" "0"
# Use -fwhole-program
CFLAGSWHOLE=-fwhole-program -DWHOLE_PROGRAM
endif
# Do a whole file compile by textually including all C code.
define whole-compile
@echo " Compiling whole program $3"
$(Q)printf '$(foreach i,$2,#include "$i"\n)' > $3.tmp.c
$(Q)$(CC) -I. $1 $(CFLAGSWHOLE) -c $3.tmp.c -o $3
endef
-%.strip.o: %.o
+%.noexec.o: %.o
@echo " Stripping $@"
- $(Q)$(STRIP) $< -o $@
+ $(Q)$(STRIP) $< -o $<.strip.o
+ $(Q)$(PYTHON) ./scripts/ldnoexec.py $<.strip.o $@
$(OUT)%.s: %.c
@echo " Compiling to assembler $@"
$(Q)$(CC) $(CFLAGS16) -S -c $< -o $@
$(OUT)%.o: %.c $(OUT)autoconf.h
@echo " Compile checking $@"
$(Q)$(CC) $(CFLAGS32FLAT) -c $< -o $@
$(OUT)%.lds: %.lds.S
@echo " Precompiling $@"
$(Q)$(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $@
@@ -171,27 +172,27 @@ $(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(O
# These are actually built by scripts/layoutrom.py above, but by pulling them
# into an extra rule we prevent make -j from spawning layoutrom.py 4 times.
$(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds $(OUT)code32flat.o $(OUT)code16.o: $(OUT)romlayout16.lds
$(OUT)rom16.o: $(OUT)code16.o $(OUT)romlayout16.lds
@echo " Linking $@"
$(Q)$(LD) -T $(OUT)romlayout16.lds $< -o $@
$(OUT)rom32seg.o: $(OUT)code32seg.o $(OUT)romlayout32seg.lds
@echo " Linking $@"
$(Q)$(LD) -T $(OUT)romlayout32seg.lds $< -o $@
-$(OUT)rom.o: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT)romlayout32flat.lds
+$(OUT)rom.o: $(OUT)rom16.noexec.o $(OUT)rom32seg.noexec.o $(OUT)code32flat.o $(OUT)romlayout32flat.lds
@echo " Linking $@"
- $(Q)$(LD) -N -T $(OUT)romlayout32flat.lds $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o -o $@
+ $(Q)$(LD) -N -T $(OUT)romlayout32flat.lds $(OUT)rom16.noexec.o $(OUT)rom32seg.noexec.o $(OUT)code32flat.o -o $@
$(OUT)bios.bin.prep: $(OUT)rom.o scripts/checkrom.py
@echo " Prepping $@"
$(Q)rm -f $(OUT)bios.bin $(OUT)Csm16.bin $(OUT)bios.bin.elf
$(Q)$(OBJDUMP) -thr $< > $<.objdump
$(Q)$(OBJCOPY) -O binary $< $(OUT)bios.bin.raw
$(Q)$(PYTHON) ./scripts/checkrom.py $<.objdump $(CONFIG_ROM_SIZE) $(OUT)bios.bin.raw $(OUT)bios.bin.prep
$(OUT)bios.bin: $(OUT)bios.bin.prep
@echo " Creating $@"
$(Q)cp $< $@
new file mode 100755
--- /dev/null
+++ b/scripts/ldnoexec.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# Script to remove EXEC flag from an ELF file
+#
+# Copyright (C) 2020 Kevin O'Connor <kevin@koconnor.net>
+#
+# This file may be distributed under the terms of the GNU GPLv3 license.
+import optparse
+
+FLAG_OFFSET = 16
+
+def main():
+ # Parse command-line arguments
+ usage = "%prog <input_file> <output_file>"
+ opts = optparse.OptionParser(usage)
+ options, args = opts.parse_args()
+ if len(args) != 2:
+ opts.error("Incorrect number of arguments")
+ infilename, outfilename = args
+ # Read input
+ f = open(infilename, "rb")
+ srcdata = f.read()
+ f.close()
+ # Update
+ outdata = bytearray(srcdata)
+ outdata[FLAG_OFFSET] = 0x01 # change ET_EXEC to ET_REL
+ # Write output
+ f = open(outfilename, "wb")
+ f.write(outdata)
+ f.close()
+
+if __name__ == '__main__':
+ main()