aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-07-16 17:57:08 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-16 17:28:55 -0500
commitd2917a477751f66571ffff3461d05da9bb70e8ae (patch)
tree57ff4df09c3d6adb6e2f3341f6f7aadcae7d1deb
parent0ba99fc6a188988f11361cb41eba7c1afce346d4 (diff)
TARGET_ARCH2 is already known at configure time.
Remove re-construction in Makefile.target Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile.target25
-rwxr-xr-xconfigure7
2 files changed, 6 insertions, 26 deletions
diff --git a/Makefile.target b/Makefile.target
index 9f550410a3..54c3568ed9 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -14,31 +14,6 @@ LIBS=
ifndef TARGET_ARCH2
TARGET_ARCH2=$(TARGET_ARCH)
endif
-ifeq ($(TARGET_ARCH),arm)
- ifeq ($(TARGET_WORDS_BIGENDIAN),yes)
- TARGET_ARCH2=armeb
- endif
-endif
-ifeq ($(TARGET_ARCH),sh4)
- ifeq ($(TARGET_WORDS_BIGENDIAN),yes)
- TARGET_ARCH2=sh4eb
- endif
-endif
-ifeq ($(TARGET_ARCH),mips)
- ifneq ($(TARGET_WORDS_BIGENDIAN),yes)
- TARGET_ARCH2=mipsel
- endif
-endif
-ifeq ($(TARGET_ARCH),mipsn32)
- ifneq ($(TARGET_WORDS_BIGENDIAN),yes)
- TARGET_ARCH2=mipsn32el
- endif
-endif
-ifeq ($(TARGET_ARCH),mips64)
- ifneq ($(TARGET_WORDS_BIGENDIAN),yes)
- TARGET_ARCH2=mips64el
- endif
-endif
ifdef CONFIG_USER_ONLY
# user emulator name
diff --git a/configure b/configure
index 17d0069c65..0c3c27d331 100755
--- a/configure
+++ b/configure
@@ -2031,6 +2031,7 @@ case "$target_arch2" in
;;
arm|armeb)
echo "TARGET_ARCH=arm" >> $config_mak
+ echo "TARGET_ARCH2=$target_arch2" >> $config_mak
echo "#define TARGET_ARCH \"arm\"" >> $config_h
echo "#define TARGET_ARM 1" >> $config_h
bflt="yes"
@@ -2063,6 +2064,7 @@ case "$target_arch2" in
;;
mips|mipsel)
echo "TARGET_ARCH=mips" >> $config_mak
+ echo "TARGET_ARCH2=$target_arch2" >> $config_mak
echo "#define TARGET_ARCH \"mips\"" >> $config_h
echo "#define TARGET_MIPS 1" >> $config_h
echo "#define TARGET_ABI_MIPSO32 1" >> $config_h
@@ -2071,6 +2073,7 @@ case "$target_arch2" in
;;
mipsn32|mipsn32el)
echo "TARGET_ARCH=mipsn32" >> $config_mak
+ echo "TARGET_ARCH2=$target_arch2" >> $config_mak
echo "TARGET_BASE_ARCH=mips" >> $config_mak
echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h
echo "#define TARGET_MIPS 1" >> $config_h
@@ -2079,6 +2082,7 @@ case "$target_arch2" in
;;
mips64|mips64el)
echo "TARGET_ARCH=mips64" >> $config_mak
+ echo "TARGET_ARCH2=$target_arch2" >> $config_mak
echo "TARGET_BASE_ARCH=mips" >> $config_mak
echo "#define TARGET_ARCH \"mips64\"" >> $config_h
echo "#define TARGET_MIPS 1" >> $config_h
@@ -2132,6 +2136,7 @@ case "$target_arch2" in
;;
sh4|sh4eb)
echo "TARGET_ARCH=sh4" >> $config_mak
+ echo "TARGET_ARCH2=$target_arch2" >> $config_mak
echo "#define TARGET_ARCH \"sh4\"" >> $config_h
echo "#define TARGET_SH4 1" >> $config_h
bflt="yes"
@@ -2157,7 +2162,7 @@ case "$target_arch2" in
echo "TARGET_ARCH=sparc64" >> $config_mak
echo "TARGET_BASE_ARCH=sparc" >> $config_mak
echo "TARGET_ABI_DIR=sparc" >> $config_mak
- echo "TARGET_ARCH2=sparc32plus" >> $config_mak
+ echo "TARGET_ARCH2=$target_arch2" >> $config_mak
echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
echo "#define TARGET_SPARC 1" >> $config_h
echo "#define TARGET_SPARC64 1" >> $config_h