Commit 938b1edd10d39cecd06b12013a5713829bcb7720
Committed by
Anthony Liguori
1 parent
b498c8a0
Only setup TARGET_ARCH when it is different of
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing
1 changed file
with
1 additions
and
11 deletions
configure
@@ -1891,15 +1891,14 @@ interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"` | @@ -1891,15 +1891,14 @@ interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"` | ||
1891 | echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h | 1891 | echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h |
1892 | gdb_xml_files="" | 1892 | gdb_xml_files="" |
1893 | 1893 | ||
1894 | +TARGET_ARCH="$target_arch2" | ||
1894 | case "$target_arch2" in | 1895 | case "$target_arch2" in |
1895 | i386) | 1896 | i386) |
1896 | - TARGET_ARCH=i386 | ||
1897 | echo "#define TARGET_ARCH \"i386\"" >> $config_h | 1897 | echo "#define TARGET_ARCH \"i386\"" >> $config_h |
1898 | echo "#define TARGET_I386 1" >> $config_h | 1898 | echo "#define TARGET_I386 1" >> $config_h |
1899 | target_phys_bits=32 | 1899 | target_phys_bits=32 |
1900 | ;; | 1900 | ;; |
1901 | x86_64) | 1901 | x86_64) |
1902 | - TARGET_ARCH=x86_64 | ||
1903 | echo "TARGET_BASE_ARCH=i386" >> $config_mak | 1902 | echo "TARGET_BASE_ARCH=i386" >> $config_mak |
1904 | echo "#define TARGET_ARCH \"x86_64\"" >> $config_h | 1903 | echo "#define TARGET_ARCH \"x86_64\"" >> $config_h |
1905 | echo "#define TARGET_I386 1" >> $config_h | 1904 | echo "#define TARGET_I386 1" >> $config_h |
@@ -1907,7 +1906,6 @@ case "$target_arch2" in | @@ -1907,7 +1906,6 @@ case "$target_arch2" in | ||
1907 | target_phys_bits=64 | 1906 | target_phys_bits=64 |
1908 | ;; | 1907 | ;; |
1909 | alpha) | 1908 | alpha) |
1910 | - TARGET_ARCH=alpha | ||
1911 | echo "#define TARGET_ARCH \"alpha\"" >> $config_h | 1909 | echo "#define TARGET_ARCH \"alpha\"" >> $config_h |
1912 | echo "#define TARGET_ALPHA 1" >> $config_h | 1910 | echo "#define TARGET_ALPHA 1" >> $config_h |
1913 | target_phys_bits=64 | 1911 | target_phys_bits=64 |
@@ -1923,14 +1921,12 @@ case "$target_arch2" in | @@ -1923,14 +1921,12 @@ case "$target_arch2" in | ||
1923 | target_phys_bits=32 | 1921 | target_phys_bits=32 |
1924 | ;; | 1922 | ;; |
1925 | cris) | 1923 | cris) |
1926 | - TARGET_ARCH=cris | ||
1927 | echo "#define TARGET_ARCH \"cris\"" >> $config_h | 1924 | echo "#define TARGET_ARCH \"cris\"" >> $config_h |
1928 | echo "#define TARGET_CRIS 1" >> $config_h | 1925 | echo "#define TARGET_CRIS 1" >> $config_h |
1929 | target_nptl="yes" | 1926 | target_nptl="yes" |
1930 | target_phys_bits=32 | 1927 | target_phys_bits=32 |
1931 | ;; | 1928 | ;; |
1932 | m68k) | 1929 | m68k) |
1933 | - TARGET_ARCH=m68k | ||
1934 | echo "#define TARGET_ARCH \"m68k\"" >> $config_h | 1930 | echo "#define TARGET_ARCH \"m68k\"" >> $config_h |
1935 | echo "#define TARGET_M68K 1" >> $config_h | 1931 | echo "#define TARGET_M68K 1" >> $config_h |
1936 | bflt="yes" | 1932 | bflt="yes" |
@@ -1938,7 +1934,6 @@ case "$target_arch2" in | @@ -1938,7 +1934,6 @@ case "$target_arch2" in | ||
1938 | target_phys_bits=32 | 1934 | target_phys_bits=32 |
1939 | ;; | 1935 | ;; |
1940 | microblaze) | 1936 | microblaze) |
1941 | - TARGET_ARCH=microblaze | ||
1942 | echo "#define TARGET_ARCH \"microblaze\"" >> $config_h | 1937 | echo "#define TARGET_ARCH \"microblaze\"" >> $config_h |
1943 | echo "#define TARGET_MICROBLAZE 1" >> $config_h | 1938 | echo "#define TARGET_MICROBLAZE 1" >> $config_h |
1944 | bflt="yes" | 1939 | bflt="yes" |
@@ -1974,14 +1969,12 @@ case "$target_arch2" in | @@ -1974,14 +1969,12 @@ case "$target_arch2" in | ||
1974 | target_phys_bits=64 | 1969 | target_phys_bits=64 |
1975 | ;; | 1970 | ;; |
1976 | ppc) | 1971 | ppc) |
1977 | - TARGET_ARCH=ppc | ||
1978 | echo "#define TARGET_ARCH \"ppc\"" >> $config_h | 1972 | echo "#define TARGET_ARCH \"ppc\"" >> $config_h |
1979 | echo "#define TARGET_PPC 1" >> $config_h | 1973 | echo "#define TARGET_PPC 1" >> $config_h |
1980 | gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" | 1974 | gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" |
1981 | target_phys_bits=32 | 1975 | target_phys_bits=32 |
1982 | ;; | 1976 | ;; |
1983 | ppcemb) | 1977 | ppcemb) |
1984 | - TARGET_ARCH=ppcemb | ||
1985 | echo "TARGET_BASE_ARCH=ppc" >> $config_mak | 1978 | echo "TARGET_BASE_ARCH=ppc" >> $config_mak |
1986 | echo "TARGET_ABI_DIR=ppc" >> $config_mak | 1979 | echo "TARGET_ABI_DIR=ppc" >> $config_mak |
1987 | echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h | 1980 | echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h |
@@ -1991,7 +1984,6 @@ case "$target_arch2" in | @@ -1991,7 +1984,6 @@ case "$target_arch2" in | ||
1991 | target_phys_bits=64 | 1984 | target_phys_bits=64 |
1992 | ;; | 1985 | ;; |
1993 | ppc64) | 1986 | ppc64) |
1994 | - TARGET_ARCH=ppc64 | ||
1995 | echo "TARGET_BASE_ARCH=ppc" >> $config_mak | 1987 | echo "TARGET_BASE_ARCH=ppc" >> $config_mak |
1996 | echo "TARGET_ABI_DIR=ppc" >> $config_mak | 1988 | echo "TARGET_ABI_DIR=ppc" >> $config_mak |
1997 | echo "#define TARGET_ARCH \"ppc64\"" >> $config_h | 1989 | echo "#define TARGET_ARCH \"ppc64\"" >> $config_h |
@@ -2022,13 +2014,11 @@ case "$target_arch2" in | @@ -2022,13 +2014,11 @@ case "$target_arch2" in | ||
2022 | target_phys_bits=32 | 2014 | target_phys_bits=32 |
2023 | ;; | 2015 | ;; |
2024 | sparc) | 2016 | sparc) |
2025 | - TARGET_ARCH=sparc | ||
2026 | echo "#define TARGET_ARCH \"sparc\"" >> $config_h | 2017 | echo "#define TARGET_ARCH \"sparc\"" >> $config_h |
2027 | echo "#define TARGET_SPARC 1" >> $config_h | 2018 | echo "#define TARGET_SPARC 1" >> $config_h |
2028 | target_phys_bits=64 | 2019 | target_phys_bits=64 |
2029 | ;; | 2020 | ;; |
2030 | sparc64) | 2021 | sparc64) |
2031 | - TARGET_ARCH=sparc64 | ||
2032 | echo "TARGET_BASE_ARCH=sparc" >> $config_mak | 2022 | echo "TARGET_BASE_ARCH=sparc" >> $config_mak |
2033 | echo "#define TARGET_ARCH \"sparc64\"" >> $config_h | 2023 | echo "#define TARGET_ARCH \"sparc64\"" >> $config_h |
2034 | echo "#define TARGET_SPARC 1" >> $config_h | 2024 | echo "#define TARGET_SPARC 1" >> $config_h |