david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify TARGET_BASE_ARCH generation

Browse Source 
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:15 +02:00 committed by Anthony Liguori
parent e73aae6715
commit 6acff7da2b
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.target
View File

@ -1,10 +1,6 @@
include config.mak include config.mak
include $(SRC_PATH)/rules.mak include $(SRC_PATH)/rules.mak
ifndef TARGET_BASE_ARCH
TARGET_BASE_ARCH:=$(TARGET_ARCH)
endif
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H

33
configure vendored
View File

@ -1892,14 +1892,14 @@ echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
gdb_xml_files="" gdb_xml_files=""
TARGET_ARCH="$target_arch2" TARGET_ARCH="$target_arch2"
TARGET_BASE_ARCH=""
case "$target_arch2" in case "$target_arch2" in
i386) i386)
target_phys_bits=32 target_phys_bits=32
;; ;;
x86_64) x86_64)
echo "TARGET_BASE_ARCH=i386" >> $config_mak TARGET_BASE_ARCH=i386
echo "#define TARGET_I386 1" >> $config_h
target_phys_bits=64 target_phys_bits=64
;; ;;
alpha) alpha)
@ -1937,16 +1937,14 @@ case "$target_arch2" in
mipsn32|mipsn32el) mipsn32|mipsn32el)
TARGET_ARCH=mipsn32 TARGET_ARCH=mipsn32
echo "TARGET_ARCH2=$target_arch2" >> $config_mak echo "TARGET_ARCH2=$target_arch2" >> $config_mak
echo "TARGET_BASE_ARCH=mips" >> $config_mak TARGET_BASE_ARCH=mips
echo "#define TARGET_MIPS 1" >> $config_h
echo "#define TARGET_ABI_MIPSN32 1" >> $config_h echo "#define TARGET_ABI_MIPSN32 1" >> $config_h
target_phys_bits=64 target_phys_bits=64
;; ;;
mips64|mips64el) mips64|mips64el)
TARGET_ARCH=mips64 TARGET_ARCH=mips64
echo "TARGET_ARCH2=$target_arch2" >> $config_mak echo "TARGET_ARCH2=$target_arch2" >> $config_mak
echo "TARGET_BASE_ARCH=mips" >> $config_mak TARGET_BASE_ARCH=mips
echo "#define TARGET_MIPS 1" >> $config_h
echo "#define TARGET_ABI_MIPSN64 1" >> $config_h echo "#define TARGET_ABI_MIPSN64 1" >> $config_h
target_phys_bits=64 target_phys_bits=64
;; ;;
@ -1955,25 +1953,22 @@ case "$target_arch2" in
target_phys_bits=32 target_phys_bits=32
;; ;;
ppcemb) ppcemb)
echo "TARGET_BASE_ARCH=ppc" >> $config_mak TARGET_BASE_ARCH=ppc
echo "TARGET_ABI_DIR=ppc" >> $config_mak echo "TARGET_ABI_DIR=ppc" >> $config_mak
echo "#define TARGET_PPC 1" >> $config_h
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)
echo "TARGET_BASE_ARCH=ppc" >> $config_mak TARGET_BASE_ARCH=ppc
echo "TARGET_ABI_DIR=ppc" >> $config_mak echo "TARGET_ABI_DIR=ppc" >> $config_mak
echo "#define TARGET_PPC 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
;; ;;
ppc64abi32) ppc64abi32)
TARGET_ARCH=ppc64 TARGET_ARCH=ppc64
echo "TARGET_BASE_ARCH=ppc" >> $config_mak TARGET_BASE_ARCH=ppc
echo "TARGET_ABI_DIR=ppc" >> $config_mak echo "TARGET_ABI_DIR=ppc" >> $config_mak
echo "TARGET_ARCH2=ppc64abi32" >> $config_mak echo "TARGET_ARCH2=ppc64abi32" >> $config_mak
echo "#define TARGET_PPC 1" >> $config_h
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
@ -1989,17 +1984,15 @@ case "$target_arch2" in
target_phys_bits=64 target_phys_bits=64
;; ;;
sparc64) sparc64)
echo "TARGET_BASE_ARCH=sparc" >> $config_mak TARGET_BASE_ARCH=sparc
echo "#define TARGET_SPARC 1" >> $config_h
elfload32="yes" elfload32="yes"
target_phys_bits=64 target_phys_bits=64
;; ;;
sparc32plus) sparc32plus)
TARGET_ARCH=sparc64 TARGET_ARCH=sparc64
echo "TARGET_BASE_ARCH=sparc" >> $config_mak TARGET_BASE_ARCH=sparc
echo "TARGET_ABI_DIR=sparc" >> $config_mak echo "TARGET_ABI_DIR=sparc" >> $config_mak
echo "TARGET_ARCH2=$target_arch2" >> $config_mak echo "TARGET_ARCH2=$target_arch2" >> $config_mak
echo "#define TARGET_SPARC 1" >> $config_h
echo "#define TARGET_ABI32 1" >> $config_h echo "#define TARGET_ABI32 1" >> $config_h
target_phys_bits=64 target_phys_bits=64
;; ;;
@ -2012,7 +2005,13 @@ echo "TARGET_ARCH=$TARGET_ARCH" >> $config_mak
echo "#define TARGET_ARCH \"$TARGET_ARCH\"" >> $config_h echo "#define TARGET_ARCH \"$TARGET_ARCH\"" >> $config_h
target_arch_name=`echo $TARGET_ARCH | tr '[:lower:]' '[:upper:]'` target_arch_name=`echo $TARGET_ARCH | tr '[:lower:]' '[:upper:]'`
echo "#define TARGET_$target_arch_name 1" >> $config_h echo "#define TARGET_$target_arch_name 1" >> $config_h
if [ "$TARGET_BASE_ARCH" = "" ]; then
TARGET_BASE_ARCH=$TARGET_ARCH
else
target_base_arch_name=`echo $TARGET_BASE_ARCH | tr '[:lower:]' '[:upper:]'`
echo "#define TARGET_$target_base_arch_name 1" >> $config_h
fi
echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $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