From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>
Subject: [PULL 02/14] pc-bios/optionrom: use -m16 unconditionally
Date: Fri, 24 Jun 2022 10:27:18 +0200 [thread overview]
Message-ID: <20220624082730.246924-3-pbonzini@redhat.com> (raw)
In-Reply-To: <20220624082730.246924-1-pbonzini@redhat.com>
Remove support for .code16gcc, all supported platforms have -m16.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
pc-bios/optionrom/Makefile | 15 +--------------
pc-bios/optionrom/code16gcc.h | 3 ---
2 files changed, 1 insertion(+), 17 deletions(-)
delete mode 100644 pc-bios/optionrom/code16gcc.h
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index f639915b4f..ea89ce9d59 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -11,7 +11,7 @@ CFLAGS = -O2 -g
quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
cc-option = $(if $(shell $(CC) $1 -c -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo OK), $1, $2)
-override CFLAGS += -march=i486 -Wall
+override CFLAGS += -march=i486 -Wall -m16
# If -fcf-protection is enabled in flags or compiler defaults that will
# conflict with -march=i486
@@ -24,21 +24,8 @@ override CFLAGS += $(filter -W%, $(QEMU_CFLAGS))
override CFLAGS += $(call cc-option, -fno-pie)
override CFLAGS += -ffreestanding -I$(TOPSRC_DIR)/include
override CFLAGS += $(call cc-option, -fno-stack-protector)
-override CFLAGS += $(call cc-option, -m16)
override CFLAGS += $(call cc-option, -Wno-array-bounds)
-ifeq ($(filter -m16, $(CFLAGS)),)
-# Attempt to work around compilers that lack -m16 (GCC <= 4.8, clang <= ??)
-# On GCC we add -fno-toplevel-reorder to keep the order of asm blocks with
-# respect to the rest of the code. clang does not have -fno-toplevel-reorder,
-# but it places all asm blocks at the beginning and we're relying on it for
-# the option ROM header. So just force clang not to use the integrated
-# assembler, which doesn't support .code16gcc.
-override CFLAGS += $(call cc-option, -fno-toplevel-reorder)
-override CFLAGS += $(call cc-option, -no-integrated-as)
-override CFLAGS += -m32 -include $(SRC_DIR)/code16gcc.h
-endif
-
Wa = -Wa,
override ASFLAGS += -32
override CFLAGS += $(call cc-option, $(Wa)-32)
diff --git a/pc-bios/optionrom/code16gcc.h b/pc-bios/optionrom/code16gcc.h
deleted file mode 100644
index 9c8d25d508..0000000000
--- a/pc-bios/optionrom/code16gcc.h
+++ /dev/null
@@ -1,3 +0,0 @@
-asm(
-".code16gcc\n"
-);
--
2.36.1
next prev parent reply other threads:[~2022-06-24 8:30 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-24 8:27 [PULL 00/14] (Mostly) build system changes for 2022-06-24 Paolo Bonzini
2022-06-24 8:27 ` [PULL 01/14] tests/vm: do not specify -bios option Paolo Bonzini
2022-06-24 8:27 ` Paolo Bonzini [this message]
2022-06-24 8:27 ` [PULL 03/14] configure, pc-bios/optionrom: pass cross CFLAGS correctly Paolo Bonzini
2022-06-24 8:27 ` [PULL 04/14] configure, pc-bios/s390-ccw: " Paolo Bonzini
2022-06-24 8:27 ` [PULL 05/14] configure, pc-bios/vof: " Paolo Bonzini
2022-06-24 8:27 ` [PULL 06/14] configure: allow more host/target combos to use the host compiler Paolo Bonzini
2022-06-24 8:27 ` [PULL 07/14] configure: write EXTRA_CFLAGS for all sub-Makefiles Paolo Bonzini
2022-06-24 8:27 ` [PULL 08/14] tests/tcg: compile system emulation tests as freestanding Paolo Bonzini
2022-06-24 8:27 ` [PULL 09/14] build: try both native and cross compilers for linux-user tests Paolo Bonzini
2022-06-24 8:27 ` [PULL 10/14] build: improve -fsanitize-coverage-allowlist check Paolo Bonzini
2022-06-24 8:27 ` [PULL 11/14] fuzz: only use generic-fuzz targets on oss-fuzz Paolo Bonzini
2022-06-24 8:27 ` [PULL 12/14] audio/dbus: fix building Paolo Bonzini
2022-06-24 8:27 ` [PULL 13/14] meson.build: Require a recent version of libpng Paolo Bonzini
2022-06-24 8:27 ` [PULL 14/14] accel: kvm: Fix memory leak in find_stats_descriptors Paolo Bonzini
2022-06-24 15:57 ` [PULL 00/14] (Mostly) build system changes for 2022-06-24 Richard Henderson
2022-06-30 17:12 ` Paolo Bonzini
2022-06-30 17:32 ` Peter Maydell
2022-07-01 0:26 ` Richard Henderson
2022-07-01 4:11 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220624082730.246924-3-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.