Commit d2917a477751f66571ffff3461d05da9bb70e8ae

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 0ba99fc6

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>
Showing 2 changed files with 6 additions and 26 deletions
Makefile.target
... ... @@ -14,31 +14,6 @@ LIBS=
14 14 ifndef TARGET_ARCH2
15 15 TARGET_ARCH2=$(TARGET_ARCH)
16 16 endif
17   -ifeq ($(TARGET_ARCH),arm)
18   - ifeq ($(TARGET_WORDS_BIGENDIAN),yes)
19   - TARGET_ARCH2=armeb
20   - endif
21   -endif
22   -ifeq ($(TARGET_ARCH),sh4)
23   - ifeq ($(TARGET_WORDS_BIGENDIAN),yes)
24   - TARGET_ARCH2=sh4eb
25   - endif
26   -endif
27   -ifeq ($(TARGET_ARCH),mips)
28   - ifneq ($(TARGET_WORDS_BIGENDIAN),yes)
29   - TARGET_ARCH2=mipsel
30   - endif
31   -endif
32   -ifeq ($(TARGET_ARCH),mipsn32)
33   - ifneq ($(TARGET_WORDS_BIGENDIAN),yes)
34   - TARGET_ARCH2=mipsn32el
35   - endif
36   -endif
37   -ifeq ($(TARGET_ARCH),mips64)
38   - ifneq ($(TARGET_WORDS_BIGENDIAN),yes)
39   - TARGET_ARCH2=mips64el
40   - endif
41   -endif
42 17  
43 18 ifdef CONFIG_USER_ONLY
44 19 # user emulator name
... ...
configure
... ... @@ -2031,6 +2031,7 @@ case &quot;$target_arch2&quot; in
2031 2031 ;;
2032 2032 arm|armeb)
2033 2033 echo "TARGET_ARCH=arm" >> $config_mak
  2034 + echo "TARGET_ARCH2=$target_arch2" >> $config_mak
2034 2035 echo "#define TARGET_ARCH \"arm\"" >> $config_h
2035 2036 echo "#define TARGET_ARM 1" >> $config_h
2036 2037 bflt="yes"
... ... @@ -2063,6 +2064,7 @@ case &quot;$target_arch2&quot; in
2063 2064 ;;
2064 2065 mips|mipsel)
2065 2066 echo "TARGET_ARCH=mips" >> $config_mak
  2067 + echo "TARGET_ARCH2=$target_arch2" >> $config_mak
2066 2068 echo "#define TARGET_ARCH \"mips\"" >> $config_h
2067 2069 echo "#define TARGET_MIPS 1" >> $config_h
2068 2070 echo "#define TARGET_ABI_MIPSO32 1" >> $config_h
... ... @@ -2071,6 +2073,7 @@ case &quot;$target_arch2&quot; in
2071 2073 ;;
2072 2074 mipsn32|mipsn32el)
2073 2075 echo "TARGET_ARCH=mipsn32" >> $config_mak
  2076 + echo "TARGET_ARCH2=$target_arch2" >> $config_mak
2074 2077 echo "TARGET_BASE_ARCH=mips" >> $config_mak
2075 2078 echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h
2076 2079 echo "#define TARGET_MIPS 1" >> $config_h
... ... @@ -2079,6 +2082,7 @@ case &quot;$target_arch2&quot; in
2079 2082 ;;
2080 2083 mips64|mips64el)
2081 2084 echo "TARGET_ARCH=mips64" >> $config_mak
  2085 + echo "TARGET_ARCH2=$target_arch2" >> $config_mak
2082 2086 echo "TARGET_BASE_ARCH=mips" >> $config_mak
2083 2087 echo "#define TARGET_ARCH \"mips64\"" >> $config_h
2084 2088 echo "#define TARGET_MIPS 1" >> $config_h
... ... @@ -2132,6 +2136,7 @@ case &quot;$target_arch2&quot; in
2132 2136 ;;
2133 2137 sh4|sh4eb)
2134 2138 echo "TARGET_ARCH=sh4" >> $config_mak
  2139 + echo "TARGET_ARCH2=$target_arch2" >> $config_mak
2135 2140 echo "#define TARGET_ARCH \"sh4\"" >> $config_h
2136 2141 echo "#define TARGET_SH4 1" >> $config_h
2137 2142 bflt="yes"
... ... @@ -2157,7 +2162,7 @@ case &quot;$target_arch2&quot; in
2157 2162 echo "TARGET_ARCH=sparc64" >> $config_mak
2158 2163 echo "TARGET_BASE_ARCH=sparc" >> $config_mak
2159 2164 echo "TARGET_ABI_DIR=sparc" >> $config_mak
2160   - echo "TARGET_ARCH2=sparc32plus" >> $config_mak
  2165 + echo "TARGET_ARCH2=$target_arch2" >> $config_mak
2161 2166 echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
2162 2167 echo "#define TARGET_SPARC 1" >> $config_h
2163 2168 echo "#define TARGET_SPARC64 1" >> $config_h
... ...