ee7ce8a949
Our linker script for optionroms specifies only the placement of the
.text section, leaving the linker free to place the remaining sections
at arbitrary places in the file.
Since at least binutils 2.39, the .note.gnu.build-id section is now
being placed at the start of the file, which causes label addresses to
be shifted. For linuxboot_dma.bin that means that the PnP header
(among others) will not be found when determining the type of ROM at
optionrom_setup():
(0x1c is the label _pnph, where the magic "PnP" is)
$ xxd /usr/share/qemu/linuxboot_dma.bin | grep "PnP"
00000010: 0000 0000 0000 0000 0000 1c00 2450 6e50 ............$PnP
$ xxd pc-bios/optionrom/linuxboot_dma.bin | grep "PnP"
00000010: 0000 0000 0000 0000 0000 4c00 2450 6e50 ............$PnP
^bad
Using a freshly built linuxboot_dma.bin ROM results in a broken boot:
SeaBIOS (version rel-1.16.2-0-gea1b7a073390-prebuilt.qemu.org)
Booting from Hard Disk...
Boot failed: could not read the boot disk
Booting from Floppy...
Boot failed: could not read the boot disk
No bootable device.
We're not using the build-id section, so pass the --build-id=none
option to the linker to remove it entirely.
Note: In theory, this same issue could happen with any other
section. The ideal solution would be to have all unused sections
discarded in the linker script. However that would be a larger change,
specially for the pvh rom which uses the .bss and COMMON sections so
I'm addressing only the immediate issue here.
Reported-by: Vasiliy Ulyanov <vulyanov@suse.de>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20230926192502.15986-1-farosas@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 35ed01ba5448208695ada5fa20a13c0a4689a1c1)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(mjt: remove unrelated stable@vger)
70 lines
2 KiB
Makefile
70 lines
2 KiB
Makefile
include config.mak
|
|
SRC_DIR := $(TOPSRC_DIR)/pc-bios/optionrom
|
|
VPATH = $(SRC_DIR)
|
|
|
|
all: multiboot.bin multiboot_dma.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin
|
|
# Dummy command so that make thinks it has done something
|
|
@true
|
|
|
|
CFLAGS = -O2 -g
|
|
|
|
NULL :=
|
|
SPACE := $(NULL) #
|
|
TARGET_PREFIX := $(patsubst %/,%:$(SPACE),$(TARGET_DIR))
|
|
|
|
quiet-@ = $(if $(V),,@$(if $1,printf "%s\n" "$(TARGET_PREFIX)$1" && ))
|
|
quiet-command = $(call quiet-@,$2 $@)$1
|
|
|
|
# Flags for dependency generation
|
|
override CPPFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d
|
|
|
|
override CFLAGS += -march=i486 -Wall $(EXTRA_CFLAGS) -m16
|
|
override CFLAGS += -ffreestanding -I$(TOPSRC_DIR)/include
|
|
|
|
cc-test = $(CC) -Werror $1 -c -o /dev/null -xc /dev/null >/dev/null 2>/dev/null
|
|
cc-option = if $(call cc-test, $1); then \
|
|
echo "$(TARGET_PREFIX)$1 detected" && echo "override CFLAGS += $1" >&3; else \
|
|
echo "$(TARGET_PREFIX)$1 not detected" $(if $2,&& echo "override CFLAGS += $2" >&3); fi
|
|
|
|
# If -fcf-protection is enabled in flags or compiler defaults that will
|
|
# conflict with -march=i486
|
|
config-cc.mak: Makefile
|
|
$(quiet-@)($(call cc-option,-fcf-protection=none); \
|
|
$(call cc-option,-fno-pie); \
|
|
$(call cc-option,-no-pie); \
|
|
$(call cc-option,-fno-stack-protector); \
|
|
$(call cc-option,-Wno-array-bounds)) 3> config-cc.mak
|
|
-include config-cc.mak
|
|
|
|
override LDFLAGS = -nostdlib -Wl,--build-id=none,-T,$(SRC_DIR)/flat.lds
|
|
|
|
pvh.img: pvh.o pvh_main.o
|
|
|
|
%.o: %.S
|
|
$(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,Assembling)
|
|
|
|
%.o: %.c
|
|
$(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,Compiling)
|
|
|
|
%.img: %.o
|
|
$(call quiet-command,$(CC) $(CFLAGS) $(LDFLAGS) -s -o $@ $^,Linking)
|
|
|
|
%.raw: %.img
|
|
$(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,Extracting raw object)
|
|
|
|
%.bin: %.raw
|
|
$(call quiet-command,$(PYTHON) $(TOPSRC_DIR)/scripts/signrom.py $< $@,Computing checksum into)
|
|
|
|
include $(wildcard *.d)
|
|
|
|
clean:
|
|
rm -f *.o *.d *.raw *.img *.bin *~
|
|
|
|
distclean:
|
|
rm -f config-cc.mak
|
|
|
|
# suppress auto-removal of intermediate files
|
|
.SECONDARY:
|
|
|
|
.PHONY: all clean distclean
|