gwj / at91sam9263 · Commits

Commit 600309b6108484a60be4a84cfe68e6b8d645799c

Authored by Blue Swirl
1 parent cbbfacc6

Rename target_cpu to target_arch2 

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Inline Side-by-side
Showing 1 changed file with 45 additions and 45 deletions
configure
  View file @600309b
... ... @@ -467,11 +467,11 @@ for opt do
467 467 sparc_cpu="$optarg"
468 468 case $sparc_cpu in
469 469 v7|v8) SP_CFLAGS="-m32 -mcpu=${sparc_cpu} -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32"
470   - target_cpu="sparc"; cpu="sparc" ;;
  470 + target_arch2="sparc"; cpu="sparc" ;;
471 471 v8plus|v8plusa) SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32"
472   - target_cpu="sparc"; cpu="sparc" ;;
  472 + target_arch2="sparc"; cpu="sparc" ;;
473 473 v9) SP_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m64"
474   - target_cpu="sparc64"; cpu="sparc64" ;;
  474 + target_arch2="sparc64"; cpu="sparc64" ;;
475 475 *) echo "undefined SPARC architecture. Exiting";exit 1;;
476 476 esac
477 477 ;;
... ... @@ -1888,40 +1888,40 @@ for target in $target_list; do
1888 1888 target_dir="$target"
1889 1889 config_mak=$target_dir/config.mak
1890 1890 config_h=$target_dir/config.h
1891   -target_cpu=`echo $target | cut -d '-' -f 1`
  1891 +target_arch2=`echo $target | cut -d '-' -f 1`
1892 1892 target_bigendian="no"
1893   -[ "$target_cpu" = "armeb" ] && target_bigendian=yes
1894   -[ "$target_cpu" = "m68k" ] && target_bigendian=yes
1895   -[ "$target_cpu" = "microblaze" ] && target_bigendian=yes
1896   -[ "$target_cpu" = "mips" ] && target_bigendian=yes
1897   -[ "$target_cpu" = "mipsn32" ] && target_bigendian=yes
1898   -[ "$target_cpu" = "mips64" ] && target_bigendian=yes
1899   -[ "$target_cpu" = "ppc" ] && target_bigendian=yes
1900   -[ "$target_cpu" = "ppcemb" ] && target_bigendian=yes
1901   -[ "$target_cpu" = "ppc64" ] && target_bigendian=yes
1902   -[ "$target_cpu" = "ppc64abi32" ] && target_bigendian=yes
1903   -[ "$target_cpu" = "sh4eb" ] && target_bigendian=yes
1904   -[ "$target_cpu" = "sparc" ] && target_bigendian=yes
1905   -[ "$target_cpu" = "sparc64" ] && target_bigendian=yes
1906   -[ "$target_cpu" = "sparc32plus" ] && target_bigendian=yes
  1893 +[ "$target_arch2" = "armeb" ] && target_bigendian=yes
  1894 +[ "$target_arch2" = "m68k" ] && target_bigendian=yes
  1895 +[ "$target_arch2" = "microblaze" ] && target_bigendian=yes
  1896 +[ "$target_arch2" = "mips" ] && target_bigendian=yes
  1897 +[ "$target_arch2" = "mipsn32" ] && target_bigendian=yes
  1898 +[ "$target_arch2" = "mips64" ] && target_bigendian=yes
  1899 +[ "$target_arch2" = "ppc" ] && target_bigendian=yes
  1900 +[ "$target_arch2" = "ppcemb" ] && target_bigendian=yes
  1901 +[ "$target_arch2" = "ppc64" ] && target_bigendian=yes
  1902 +[ "$target_arch2" = "ppc64abi32" ] && target_bigendian=yes
  1903 +[ "$target_arch2" = "sh4eb" ] && target_bigendian=yes
  1904 +[ "$target_arch2" = "sparc" ] && target_bigendian=yes
  1905 +[ "$target_arch2" = "sparc64" ] && target_bigendian=yes
  1906 +[ "$target_arch2" = "sparc32plus" ] && target_bigendian=yes
1907 1907 target_softmmu="no"
1908 1908 target_user_only="no"
1909 1909 target_linux_user="no"
1910 1910 target_darwin_user="no"
1911 1911 target_bsd_user="no"
1912 1912 case "$target" in
1913   - ${target_cpu}-softmmu)
  1913 + ${target_arch2}-softmmu)
1914 1914 target_softmmu="yes"
1915 1915 ;;
1916   - ${target_cpu}-linux-user)
  1916 + ${target_arch2}-linux-user)
1917 1917 target_user_only="yes"
1918 1918 target_linux_user="yes"
1919 1919 ;;
1920   - ${target_cpu}-darwin-user)
  1920 + ${target_arch2}-darwin-user)
1921 1921 target_user_only="yes"
1922 1922 target_darwin_user="yes"
1923 1923 ;;
1924   - ${target_cpu}-bsd-user)
  1924 + ${target_arch2}-bsd-user)
1925 1925 target_user_only="yes"
1926 1926 target_bsd_user="yes"
1927 1927 ;;
... ... @@ -1959,16 +1959,16 @@ echo &quot;#include \&quot;../config-host.h\&quot;&quot; &gt;&gt; $config_h
1959 1959 bflt="no"
1960 1960 elfload32="no"
1961 1961 target_nptl="no"
1962   -interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
  1962 +interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"`
1963 1963 echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
1964 1964 gdb_xml_files=""
1965 1965 target_kvm="$kvm"
1966 1966  
1967 1967 # Make sure the target and host cpus are compatible
1968   -if test ! \( "$target_cpu" = "$cpu" -o \
1969   - \( "$target_cpu" = "ppcemb" -a "$cpu" = "ppc" \) -o \
1970   - \( "$target_cpu" = "x86_64" -a "$cpu" = "i386" \) -o \
1971   - \( "$target_cpu" = "i386" -a "$cpu" = "x86_64" \) \) ; then
  1968 +if test ! \( "$target_arch2" = "$cpu" -o \
  1969 + \( "$target_arch2" = "ppcemb" -a "$cpu" = "ppc" \) -o \
  1970 + \( "$target_arch2" = "x86_64" -a "$cpu" = "i386" \) -o \
  1971 + \( "$target_arch2" = "i386" -a "$cpu" = "x86_64" \) \) ; then
1972 1972 target_kvm="no"
1973 1973 fi
1974 1974 # Disable KVM for linux-user
... ... @@ -1976,7 +1976,7 @@ if test &quot;$target_softmmu&quot; = &quot;no&quot; ; then
1976 1976 target_kvm="no"
1977 1977 fi
1978 1978  
1979   -case "$target_cpu" in
  1979 +case "$target_arch2" in
1980 1980 i386)
1981 1981 echo "TARGET_ARCH=i386" >> $config_mak
1982 1982 echo "#define TARGET_ARCH \"i386\"" >> $config_h
... ... @@ -2192,23 +2192,23 @@ if test ! -z &quot;$gdb_xml_files&quot; ; then
2192 2192 fi
2193 2193 echo "TARGET_XML_FILES=$list" >> $config_mak
2194 2194  
2195   -if test "$target_cpu" = "arm" \
2196   - -o "$target_cpu" = "armeb" \
2197   - -o "$target_cpu" = "m68k" \
2198   - -o "$target_cpu" = "microblaze" \
2199   - -o "$target_cpu" = "mips" \
2200   - -o "$target_cpu" = "mipsel" \
2201   - -o "$target_cpu" = "mipsn32" \
2202   - -o "$target_cpu" = "mipsn32el" \
2203   - -o "$target_cpu" = "mips64" \
2204   - -o "$target_cpu" = "mips64el" \
2205   - -o "$target_cpu" = "ppc" \
2206   - -o "$target_cpu" = "ppc64" \
2207   - -o "$target_cpu" = "ppc64abi32" \
2208   - -o "$target_cpu" = "ppcemb" \
2209   - -o "$target_cpu" = "sparc" \
2210   - -o "$target_cpu" = "sparc64" \
2211   - -o "$target_cpu" = "sparc32plus"; then
  2195 +if test "$target_arch2" = "arm" \
  2196 + -o "$target_arch2" = "armeb" \
  2197 + -o "$target_arch2" = "m68k" \
  2198 + -o "$target_arch2" = "microblaze" \
  2199 + -o "$target_arch2" = "mips" \
  2200 + -o "$target_arch2" = "mipsel" \
  2201 + -o "$target_arch2" = "mipsn32" \
  2202 + -o "$target_arch2" = "mipsn32el" \
  2203 + -o "$target_arch2" = "mips64" \
  2204 + -o "$target_arch2" = "mips64el" \
  2205 + -o "$target_arch2" = "ppc" \
  2206 + -o "$target_arch2" = "ppc64" \
  2207 + -o "$target_arch2" = "ppc64abi32" \
  2208 + -o "$target_arch2" = "ppcemb" \
  2209 + -o "$target_arch2" = "sparc" \
  2210 + -o "$target_arch2" = "sparc64" \
  2211 + -o "$target_arch2" = "sparc32plus"; then
2212 2212 echo "CONFIG_SOFTFLOAT=y" >> $config_mak
2213 2213 echo "#define CONFIG_SOFTFLOAT 1" >> $config_h
2214 2214 fi
... ...