[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 12/51] configure: do not invoke as/ld directly for pc-bios/opt
From: |
Alex Bennée |
Subject: |
[PATCH v1 12/51] configure: do not invoke as/ld directly for pc-bios/optionrom |
Date: |
Thu, 29 Sep 2022 12:41:52 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Just use using the compiler binary, with -nostdlib in the case of the
linker; the compiler driver (whether i686-*-gcc, or x86_64-*-gcc with
the -m32 option) will then pick the right magic option to as and ld.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
configure | 22 +++++-----------------
pc-bios/optionrom/Makefile | 12 ++++--------
2 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/configure b/configure
index 52ae4adffc..aaa09fb957 100755
--- a/configure
+++ b/configure
@@ -2298,23 +2298,11 @@ probe_target_compiler i386-softmmu
if test -n "$target_cc" &&
test "$targetos" != "darwin" && test "$targetos" != "sunos" && \
test "$targetos" != "haiku" && test "$softmmu" = yes ; then
- # Different host OS linkers have different ideas about the name of the ELF
- # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the _fbsd
- # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386pe.
- for emu in elf_i386 elf_i386_fbsd elf_i386_obsd i386pe; do
- if "$target_ld" -verbose 2>&1 | grep -q
"^[[:space:]]*${emu}[[:space:]]*$"; then
- ld_i386_emulation="$emu"
- break
- fi
- done
- if test -n "$ld_i386_emulation"; then
- roms="pc-bios/optionrom"
- config_mak=pc-bios/optionrom/config.mak
- echo "# Automatically generated by configure - do not modify" >
$config_mak
- echo "TOPSRC_DIR=$source_path" >> $config_mak
- echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_mak
- write_target_makefile >> $config_mak
- fi
+ roms="pc-bios/optionrom"
+ config_mak=pc-bios/optionrom/config.mak
+ echo "# Automatically generated by configure - do not modify" > $config_mak
+ echo "TOPSRC_DIR=$source_path" >> $config_mak
+ write_target_makefile >> $config_mak
fi
probe_target_compiler ppc-softmmu
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index e90ca2e1c6..3e06c11dea 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -20,28 +20,24 @@ override CFLAGS += $(call cc-option, -fcf-protection=none)
# Flags for dependency generation
override CPPFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d
-override CFLAGS += $(filter -W%, $(QEMU_CFLAGS))
override CFLAGS += $(call cc-option, -fno-pie)
+override CFLAGS += $(call cc-option, -no-pie)
override CFLAGS += -ffreestanding -I$(TOPSRC_DIR)/include
override CFLAGS += $(call cc-option, -fno-stack-protector)
override CFLAGS += $(call cc-option, -Wno-array-bounds)
-Wa = -Wa,
-override ASFLAGS += -32
-override CFLAGS += $(call cc-option, $(Wa)-32)
-
-override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds
+override LDFLAGS = -nostdlib -Wl,-T,$(SRC_DIR)/flat.lds
pvh.img: pvh.o pvh_main.o
%.o: %.S
- $(call quiet-command,$(CC) $(CPPFLAGS) -E -o - $< | $(AS) $(ASFLAGS) -o
$@,"AS","$@")
+ $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"AS","$@")
%.o: %.c
$(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@")
%.img: %.o
- $(call quiet-command,$(LD) $(LDFLAGS) -s -o $@ $^,"BUILD","$@")
+ $(call quiet-command,$(CC) $(CFLAGS) $(LDFLAGS) -s -o $@
$^,"BUILD","$@")
%.raw: %.img
$(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$@")
--
2.34.1
- [PATCH v1 06/51] target/hexagon: add flex/bison/glib2 to qemu.yml, (continued)
- [PATCH v1 06/51] target/hexagon: add flex/bison/glib2 to qemu.yml, Alex Bennée, 2022/09/29
- [PATCH v1 07/51] target/hexagon: regenerate docker/cirrus files, Alex Bennée, 2022/09/29
- [PATCH v1 03/51] scripts/ci/setup: spice-server only on x86 aarch64, Alex Bennée, 2022/09/29
- [PATCH v1 01/51] scripts/ci/setup: ninja missing from build-environment, Alex Bennée, 2022/09/29
- [PATCH v1 02/51] scripts/ci/setup: Fix libxen requirements, Alex Bennée, 2022/09/29
- [PATCH v1 08/51] target/hexagon: manually add flex/bison/glib2 to remaining containers, Alex Bennée, 2022/09/29
- [PATCH v1 11/51] tests/qtest: bump up QOS_PATH_MAX_ELEMENT_SIZE, Alex Bennée, 2022/09/29
- [PATCH v1 05/51] configure: move detected gdb to TCG's config-host.mak, Alex Bennée, 2022/09/29
- [PATCH v1 10/51] tests/docker: move alpine from edge to tagged release, Alex Bennée, 2022/09/29
- [PATCH v1 14/51] pc-bios/s390-ccw: detect CC options just once, Alex Bennée, 2022/09/29
- [PATCH v1 12/51] configure: do not invoke as/ld directly for pc-bios/optionrom,
Alex Bennée <=
- [PATCH v1 04/51] tests/docker: run script use realpath instead of readlink, Alex Bennée, 2022/09/29
- [PATCH v1 16/51] build: add recursive distclean rules, Alex Bennée, 2022/09/29
- [PATCH v1 28/51] configure: build ROMs with container-based cross compilers, Alex Bennée, 2022/09/29
- [PATCH v1 09/51] tests/docker: update fedora-win[32|64]-cross with lcitool, Alex Bennée, 2022/09/29
- [PATCH v1 13/51] pc-bios/optionrom: detect CC options just once, Alex Bennée, 2022/09/29
- [PATCH v1 15/51] vof: add distclean target, Alex Bennée, 2022/09/29
- [PATCH v1 19/51] tests: simplify Makefile invocation for tests/tcg, Alex Bennée, 2022/09/29