mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify TARGET_ARCH2 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:16 +02:00 committed by Anthony Liguori
parent 6acff7da2b
commit 0adcffb1ce
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.target
View File

@ -6,10 +6,6 @@ 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
#CFLAGS+=-Werror #CFLAGS+=-Werror
LIBS= LIBS=
# user emulator name
ifndef TARGET_ARCH2
TARGET_ARCH2=$(TARGET_ARCH)
endif
ifdef CONFIG_USER_ONLY ifdef CONFIG_USER_ONLY
# user emulator name # user emulator name

8
configure vendored
View File

@ -1907,7 +1907,6 @@ case "$target_arch2" in
;; ;;
arm|armeb) arm|armeb)
TARGET_ARCH=arm TARGET_ARCH=arm
echo "TARGET_ARCH2=$target_arch2" >> $config_mak
bflt="yes" bflt="yes"
target_nptl="yes" target_nptl="yes"
gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml" gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"
@ -1929,21 +1928,18 @@ case "$target_arch2" in
;; ;;
mips|mipsel) mips|mipsel)
TARGET_ARCH=mips TARGET_ARCH=mips
echo "TARGET_ARCH2=$target_arch2" >> $config_mak
echo "#define TARGET_ABI_MIPSO32 1" >> $config_h echo "#define TARGET_ABI_MIPSO32 1" >> $config_h
target_nptl="yes" target_nptl="yes"
target_phys_bits=64 target_phys_bits=64
;; ;;
mipsn32|mipsn32el) mipsn32|mipsn32el)
TARGET_ARCH=mipsn32 TARGET_ARCH=mipsn32
echo "TARGET_ARCH2=$target_arch2" >> $config_mak
TARGET_BASE_ARCH=mips TARGET_BASE_ARCH=mips
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
TARGET_BASE_ARCH=mips TARGET_BASE_ARCH=mips
echo "#define TARGET_ABI_MIPSN64 1" >> $config_h echo "#define TARGET_ABI_MIPSN64 1" >> $config_h
target_phys_bits=64 target_phys_bits=64
@ -1968,14 +1964,12 @@ case "$target_arch2" in
TARGET_ARCH=ppc64 TARGET_ARCH=ppc64
TARGET_BASE_ARCH=ppc 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 "#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
;; ;;
sh4|sh4eb) sh4|sh4eb)
TARGET_ARCH=sh4 TARGET_ARCH=sh4
echo "TARGET_ARCH2=$target_arch2" >> $config_mak
bflt="yes" bflt="yes"
target_nptl="yes" target_nptl="yes"
target_phys_bits=32 target_phys_bits=32
@ -1992,7 +1986,6 @@ case "$target_arch2" in
TARGET_ARCH=sparc64 TARGET_ARCH=sparc64
TARGET_BASE_ARCH=sparc 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 "#define TARGET_ABI32 1" >> $config_h echo "#define TARGET_ABI32 1" >> $config_h
target_phys_bits=64 target_phys_bits=64
;; ;;
@ -2002,6 +1995,7 @@ case "$target_arch2" in
;; ;;
esac esac
echo "TARGET_ARCH=$TARGET_ARCH" >> $config_mak echo "TARGET_ARCH=$TARGET_ARCH" >> $config_mak
echo "TARGET_ARCH2=$target_arch2" >> $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