falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify TARGET_ABI_DIR generation 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-07-16 18:34:17 +02:00 committed by Anthony Liguori
parent 0adcffb1ce
commit e6e91b9c3d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.target
View File

@ -172,9 +172,6 @@ cpu-exec.o: CFLAGS += $(HELPER_CFLAGS)
ifdef CONFIG_LINUX_USER 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) 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) CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)

13
configure vendored
View File

@ -1893,6 +1893,7 @@ gdb_xml_files=""
TARGET_ARCH="$target_arch2" TARGET_ARCH="$target_arch2"
TARGET_BASE_ARCH="" TARGET_BASE_ARCH=""
TARGET_ABI_DIR=""
case "$target_arch2" in case "$target_arch2" in
i386) i386)
@ -1950,20 +1951,20 @@ case "$target_arch2" in
;; ;;
ppcemb) ppcemb)
TARGET_BASE_ARCH=ppc 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" gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64 target_phys_bits=64
;; ;;
ppc64) ppc64)
TARGET_BASE_ARCH=ppc 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" gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64 target_phys_bits=64
;; ;;
ppc64abi32) ppc64abi32)
TARGET_ARCH=ppc64 TARGET_ARCH=ppc64
TARGET_BASE_ARCH=ppc TARGET_BASE_ARCH=ppc
echo "TARGET_ABI_DIR=ppc" >> $config_mak TARGET_ABI_DIR=ppc
echo "#define TARGET_ABI32 1" >> $config_h echo "#define TARGET_ABI32 1" >> $config_h
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml" gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64 target_phys_bits=64
@ -1985,7 +1986,7 @@ case "$target_arch2" in
sparc32plus) sparc32plus)
TARGET_ARCH=sparc64 TARGET_ARCH=sparc64
TARGET_BASE_ARCH=sparc TARGET_BASE_ARCH=sparc
echo "TARGET_ABI_DIR=sparc" >> $config_mak TARGET_ABI_DIR=sparc
echo "#define TARGET_ABI32 1" >> $config_h echo "#define TARGET_ABI32 1" >> $config_h
target_phys_bits=64 target_phys_bits=64
;; ;;
@ -2006,6 +2007,10 @@ else
echo "#define TARGET_$target_base_arch_name 1" >> $config_h echo "#define TARGET_$target_base_arch_name 1" >> $config_h
fi fi
echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_mak 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 if [ $target_phys_bits -lt $hostlongbits ] ; then
target_phys_bits=$hostlongbits target_phys_bits=$hostlongbits
fi fi