[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/19] configure: remove useless config-target.mak symbols
From: |
Paolo Bonzini |
Subject: |
[PULL 08/19] configure: remove useless config-target.mak symbols |
Date: |
Mon, 5 Oct 2020 10:23:38 +0200 |
Omit symbols that are not needed by softmmu or bsd-user targets,
in preparation for moving the generated config-target.mak files
into the source tree.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index 7058ac10e9..a8e314dd53 100755
--- a/configure
+++ b/configure
@@ -7471,7 +7471,7 @@ case "$target_name" in
mips|mipsel)
mttcg="yes"
TARGET_ARCH=mips
- echo "TARGET_ABI_MIPSO32=y" >> $config_target_mak
+ test "$target_user_only" = yes && echo "TARGET_ABI_MIPSO32=y" >>
$config_target_mak
TARGET_SYSTBL_ABI=o32
TARGET_SYSTBL=syscall_o32.tbl
;;
@@ -7479,8 +7479,8 @@ case "$target_name" in
mttcg="yes"
TARGET_ARCH=mips64
TARGET_BASE_ARCH=mips
- echo "TARGET_ABI_MIPSN32=y" >> $config_target_mak
- echo "TARGET_ABI32=y" >> $config_target_mak
+ test "$target_user_only" = yes && echo "TARGET_ABI_MIPSN32=y" >>
$config_target_mak
+ test "$target_user_only" = yes && echo "TARGET_ABI32=y" >>
$config_target_mak
TARGET_SYSTBL_ABI=n32
TARGET_SYSTBL=syscall_n32.tbl
;;
@@ -7488,7 +7488,7 @@ case "$target_name" in
mttcg="no"
TARGET_ARCH=mips64
TARGET_BASE_ARCH=mips
- echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak
+ test "$target_user_only" = yes && echo "TARGET_ABI_MIPSN64=y" >>
$config_target_mak
TARGET_SYSTBL_ABI=n64
TARGET_SYSTBL=syscall_n64.tbl
;;
@@ -7524,7 +7524,7 @@ case "$target_name" in
TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc
TARGET_SYSTBL_ABI=common,nospu,32
- echo "TARGET_ABI32=y" >> $config_target_mak
+ test "$target_user_only" = yes && echo "TARGET_ABI32=y" >>
$config_target_mak
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml
power-spe.xml power-vsx.xml"
;;
riscv32)
@@ -7562,7 +7562,7 @@ case "$target_name" in
TARGET_BASE_ARCH=sparc
TARGET_ABI_DIR=sparc
TARGET_SYSTBL_ABI=common,32
- echo "TARGET_ABI32=y" >> $config_target_mak
+ test "$target_user_only" = yes && echo "TARGET_ABI32=y" >>
$config_target_mak
;;
s390x)
TARGET_SYSTBL_ABI=common,64
@@ -7600,15 +7600,18 @@ upper() {
target_arch_name="$(upper $TARGET_ARCH)"
echo "TARGET_$target_arch_name=y" >> $config_target_mak
echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_target_mak
-if [ "$TARGET_ABI_DIR" = "" ]; then
- TARGET_ABI_DIR=$TARGET_ARCH
+if test "$target_user_only" = "yes" ; then
+ if [ "$TARGET_ABI_DIR" = "" ]; then
+ TARGET_ABI_DIR=$TARGET_ARCH
+ fi
+ echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak
fi
-echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak
-if [ "$TARGET_SYSTBL_ABI" != "" ]; then
+if test "$target_linux_user" = "yes" ; then
+ if [ "$TARGET_SYSTBL_ABI" != "" ]; then
echo "TARGET_SYSTBL_ABI=$TARGET_SYSTBL_ABI" >> $config_target_mak
echo "TARGET_SYSTBL=$TARGET_SYSTBL" >> $config_target_mak
+ fi
fi
-
if test "$target_aligned_only" = "yes" ; then
echo "TARGET_ALIGNED_ONLY=y" >> $config_target_mak
fi
--
2.26.2
- [PULL 00/19] Build system + MCE patches for 2020-10-05, Paolo Bonzini, 2020/10/05
- [PULL 01/19] travis: remove TCI test, Paolo Bonzini, 2020/10/05
- [PULL 02/19] default-configs: move files to default-configs/devices/, Paolo Bonzini, 2020/10/05
- [PULL 07/19] configure: compute derivatives of target name in meson, Paolo Bonzini, 2020/10/05
- [PULL 04/19] configure: rewrite accelerator defaults as tests, Paolo Bonzini, 2020/10/05
- [PULL 03/19] configure: convert accelerator variables to meson options, Paolo Bonzini, 2020/10/05
- [PULL 06/19] configure: remove dead variable, Paolo Bonzini, 2020/10/05
- [PULL 08/19] configure: remove useless config-target.mak symbols,
Paolo Bonzini <=
- [PULL 05/19] configure: move accelerator logic to meson, Paolo Bonzini, 2020/10/05
- [PULL 11/19] configure: move OpenBSD W^X test to meson, Paolo Bonzini, 2020/10/05
- [PULL 12/19] default-configs: use TARGET_ARCH key, Paolo Bonzini, 2020/10/05
- [PULL 10/19] default-configs: remove default-configs/devices for user-mode targets, Paolo Bonzini, 2020/10/05
- [PULL 13/19] default-configs: remove redundant keys, Paolo Bonzini, 2020/10/05
- [PULL 15/19] target-i386: seperate MCIP & MCE_MASK error reason, Paolo Bonzini, 2020/10/05
- [PULL 16/19] qapi/run-state.json: introduce memory failure event, Paolo Bonzini, 2020/10/05
- [PULL 09/19] configure: remove target configuration, Paolo Bonzini, 2020/10/05
- [PULL 19/19] dockerfiles: add diffutils to Fedora, Paolo Bonzini, 2020/10/05
- [PULL 14/19] meson: move sparse detection to Meson and rewrite check_sparse.py, Paolo Bonzini, 2020/10/05