diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-08-09 22:50:40 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-08-09 22:57:36 +0200 |
| commit | 9d4cd7b4ed413a1371997ce74da39900b2a8473b (patch) | |
| tree | 6e4865a2cb57b9ad3e03fc7ad6b5b9d5c3b2c64e /pc-bios/optionrom | |
| parent | b0e8f5cadcce7c1e2047e1e2c96f827a26171f58 (diff) | |
| download | qemu-9d4cd7b4ed413a1371997ce74da39900b2a8473b.zip qemu-9d4cd7b4ed413a1371997ce74da39900b2a8473b.tar.gz qemu-9d4cd7b4ed413a1371997ce74da39900b2a8473b.tar.bz2 | |
optionrom: fix compilation with mingw docker target
Two fixes are needed. First, mingw does not have -D_FORTIFY_SOURCE,
hence --enable-debug disables optimization. This is not acceptable
for ROMs, which should override CFLAGS to force inclusion of -O2.
Second, PE stores global constructors and destructors using the
following linker script snippet:
___CTOR_LIST__ = .; __CTOR_LIST__ = . ;
LONG (-1);*(.ctors); *(.ctor); *(SORT(.ctors.*)); LONG (0);
___DTOR_LIST__ = .; __DTOR_LIST__ = . ;
LONG (-1); *(.dtors); *(.dtor); *(SORT(.dtors.*)); LONG (0);
The LONG directives cause the .img files to be 16 bytes too large;
the recently added check to signrom.py catches this. To fix this,
replace -T and -e options with a linker script.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'pc-bios/optionrom')
| -rw-r--r-- | pc-bios/optionrom/Makefile | 10 | ||||
| -rw-r--r-- | pc-bios/optionrom/flat.lds | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 9c018ea..8aef152 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -9,6 +9,14 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/optionrom) .PHONY : all clean build-all +# Compiling with no optimization creates ROMs that are too large +ifeq ($(filter -O%, $(CFLAGS)),) +override CFLAGS += -O2 +endif +ifeq ($(filter -O%, $(CFLAGS)),-O0) +override CFLAGS += -O2 +endif + # Drop -fstack-protector and the like QEMU_CFLAGS := $(filter -W%, $(QEMU_CFLAGS)) $(CFLAGS_NOPIE) -ffreestanding QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -fno-stack-protector) @@ -51,7 +59,7 @@ endif endif %.img: %.o - $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_EMULATION) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") + $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $<," Building $(TARGET_DIR)$@") %.raw: %.img $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@," Building $(TARGET_DIR)$@") diff --git a/pc-bios/optionrom/flat.lds b/pc-bios/optionrom/flat.lds new file mode 100644 index 0000000..cee2eda --- /dev/null +++ b/pc-bios/optionrom/flat.lds @@ -0,0 +1,6 @@ +SECTIONS +{ + . = 0; + .text : { *(.text) *(.text.$) } +} +ENTRY(_start) |