[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] simplify TARGET_ABI_DIR generation
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 3/6] simplify TARGET_ABI_DIR generation |
Date: |
Wed, 15 Jul 2009 17:26:31 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile.target | 3 ---
configure | 13 +++++++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 1f0a86d..327b03b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -172,9 +172,6 @@ cpu-exec.o: CFLAGS += $(HELPER_CFLAGS)
ifdef CONFIG_LINUX_USER
-ifndef TARGET_ABI_DIR
- TARGET_ABI_DIR=$(TARGET_ARCH)
-endif
VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
diff --git a/configure b/configure
index 95bc639..bcdf109 100755
--- a/configure
+++ b/configure
@@ -1887,6 +1887,7 @@ gdb_xml_files=""
TARGET_ARCH="$target_arch2"
TARGET_BASE_ARCH=""
+TARGET_ABI_DIR=""
case "$target_arch2" in
i386)
@@ -1944,20 +1945,20 @@ case "$target_arch2" in
;;
ppcemb)
TARGET_BASE_ARCH=ppc
- echo "TARGET_ABI_DIR=ppc" >> $config_mak
+ TARGET_ABI_DIR=ppc
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml
power-spe.xml"
target_phys_bits=64
;;
ppc64)
TARGET_BASE_ARCH=ppc
- echo "TARGET_ABI_DIR=ppc" >> $config_mak
+ TARGET_ABI_DIR=ppc
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml
power-spe.xml"
target_phys_bits=64
;;
ppc64abi32)
TARGET_ARCH=ppc64
TARGET_BASE_ARCH=ppc
- echo "TARGET_ABI_DIR=ppc" >> $config_mak
+ TARGET_ABI_DIR=ppc
echo "#define TARGET_ABI32 1" >> $config_h
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml
power-spe.xml"
target_phys_bits=64
@@ -1979,7 +1980,7 @@ case "$target_arch2" in
sparc32plus)
TARGET_ARCH=sparc64
TARGET_BASE_ARCH=sparc
- echo "TARGET_ABI_DIR=sparc" >> $config_mak
+ TARGET_ABI_DIR=sparc
echo "#define TARGET_ABI32 1" >> $config_h
target_phys_bits=64
;;
@@ -2000,6 +2001,10 @@ else
echo "#define TARGET_$target_base_arch_name 1" >> $config_h
fi
echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_mak
+if [ "$TARGET_ABI_DIR" = "" ]; then
+ TARGET_ABI_DIR=$TARGET_ARCH
+fi
+echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_mak
if [ $target_phys_bits -lt $hostlongbits ] ; then
target_phys_bits=$hostlongbits
fi
--
1.6.2.5
- [Qemu-devel] [RFC PATCH 0/6] Generate config_h from config.mak, quintela, 2009/07/15
- [Qemu-devel] [PATCH 2/6] simplify TARGET_ARCH2 generation, quintela, 2009/07/15
- [Qemu-devel] [PATCH 3/6] simplify TARGET_ABI_DIR generation,
quintela <=
- [Qemu-devel] [PATCH 4/6] rename s/config_mak/config_host_mak/ and s/config_h/config_host_h/, quintela, 2009/07/15
- [Qemu-devel] [PATCH 5/6] Refactor config_softfloat selection in another list, quintela, 2009/07/15
- [Qemu-devel] [PATCH 6/6] Generate $target_dir/config.h from $target_dir/config.mak, quintela, 2009/07/15
- [Qemu-devel] [PATCH 1/6] simplify TARGET_BASE_ARCH generation, quintela, 2009/07/15