Commit b498c8a08814545c14a1ffca3187b23f4cbc75de
Committed by
Anthony Liguori
1 parent
ea2d6a39
print only once TARGET_ARCH
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing
1 changed file
with
19 additions
and
18 deletions
configure
... | ... | @@ -1893,13 +1893,13 @@ gdb_xml_files="" |
1893 | 1893 | |
1894 | 1894 | case "$target_arch2" in |
1895 | 1895 | i386) |
1896 | - echo "TARGET_ARCH=i386" >> $config_mak | |
1896 | + TARGET_ARCH=i386 | |
1897 | 1897 | echo "#define TARGET_ARCH \"i386\"" >> $config_h |
1898 | 1898 | echo "#define TARGET_I386 1" >> $config_h |
1899 | 1899 | target_phys_bits=32 |
1900 | 1900 | ;; |
1901 | 1901 | x86_64) |
1902 | - echo "TARGET_ARCH=x86_64" >> $config_mak | |
1902 | + TARGET_ARCH=x86_64 | |
1903 | 1903 | echo "TARGET_BASE_ARCH=i386" >> $config_mak |
1904 | 1904 | echo "#define TARGET_ARCH \"x86_64\"" >> $config_h |
1905 | 1905 | echo "#define TARGET_I386 1" >> $config_h |
... | ... | @@ -1907,13 +1907,13 @@ case "$target_arch2" in |
1907 | 1907 | target_phys_bits=64 |
1908 | 1908 | ;; |
1909 | 1909 | alpha) |
1910 | - echo "TARGET_ARCH=alpha" >> $config_mak | |
1910 | + TARGET_ARCH=alpha | |
1911 | 1911 | echo "#define TARGET_ARCH \"alpha\"" >> $config_h |
1912 | 1912 | echo "#define TARGET_ALPHA 1" >> $config_h |
1913 | 1913 | target_phys_bits=64 |
1914 | 1914 | ;; |
1915 | 1915 | arm|armeb) |
1916 | - echo "TARGET_ARCH=arm" >> $config_mak | |
1916 | + TARGET_ARCH=arm | |
1917 | 1917 | echo "TARGET_ARCH2=$target_arch2" >> $config_mak |
1918 | 1918 | echo "#define TARGET_ARCH \"arm\"" >> $config_h |
1919 | 1919 | echo "#define TARGET_ARM 1" >> $config_h |
... | ... | @@ -1923,14 +1923,14 @@ case "$target_arch2" in |
1923 | 1923 | target_phys_bits=32 |
1924 | 1924 | ;; |
1925 | 1925 | cris) |
1926 | - echo "TARGET_ARCH=cris" >> $config_mak | |
1926 | + TARGET_ARCH=cris | |
1927 | 1927 | echo "#define TARGET_ARCH \"cris\"" >> $config_h |
1928 | 1928 | echo "#define TARGET_CRIS 1" >> $config_h |
1929 | 1929 | target_nptl="yes" |
1930 | 1930 | target_phys_bits=32 |
1931 | 1931 | ;; |
1932 | 1932 | m68k) |
1933 | - echo "TARGET_ARCH=m68k" >> $config_mak | |
1933 | + TARGET_ARCH=m68k | |
1934 | 1934 | echo "#define TARGET_ARCH \"m68k\"" >> $config_h |
1935 | 1935 | echo "#define TARGET_M68K 1" >> $config_h |
1936 | 1936 | bflt="yes" |
... | ... | @@ -1938,7 +1938,7 @@ case "$target_arch2" in |
1938 | 1938 | target_phys_bits=32 |
1939 | 1939 | ;; |
1940 | 1940 | microblaze) |
1941 | - echo "TARGET_ARCH=microblaze" >> $config_mak | |
1941 | + TARGET_ARCH=microblaze | |
1942 | 1942 | echo "#define TARGET_ARCH \"microblaze\"" >> $config_h |
1943 | 1943 | echo "#define TARGET_MICROBLAZE 1" >> $config_h |
1944 | 1944 | bflt="yes" |
... | ... | @@ -1946,7 +1946,7 @@ case "$target_arch2" in |
1946 | 1946 | target_phys_bits=32 |
1947 | 1947 | ;; |
1948 | 1948 | mips|mipsel) |
1949 | - echo "TARGET_ARCH=mips" >> $config_mak | |
1949 | + TARGET_ARCH=mips | |
1950 | 1950 | echo "TARGET_ARCH2=$target_arch2" >> $config_mak |
1951 | 1951 | echo "#define TARGET_ARCH \"mips\"" >> $config_h |
1952 | 1952 | echo "#define TARGET_MIPS 1" >> $config_h |
... | ... | @@ -1955,7 +1955,7 @@ case "$target_arch2" in |
1955 | 1955 | target_phys_bits=64 |
1956 | 1956 | ;; |
1957 | 1957 | mipsn32|mipsn32el) |
1958 | - echo "TARGET_ARCH=mipsn32" >> $config_mak | |
1958 | + TARGET_ARCH=mipsn32 | |
1959 | 1959 | echo "TARGET_ARCH2=$target_arch2" >> $config_mak |
1960 | 1960 | echo "TARGET_BASE_ARCH=mips" >> $config_mak |
1961 | 1961 | echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h |
... | ... | @@ -1964,7 +1964,7 @@ case "$target_arch2" in |
1964 | 1964 | target_phys_bits=64 |
1965 | 1965 | ;; |
1966 | 1966 | mips64|mips64el) |
1967 | - echo "TARGET_ARCH=mips64" >> $config_mak | |
1967 | + TARGET_ARCH=mips64 | |
1968 | 1968 | echo "TARGET_ARCH2=$target_arch2" >> $config_mak |
1969 | 1969 | echo "TARGET_BASE_ARCH=mips" >> $config_mak |
1970 | 1970 | echo "#define TARGET_ARCH \"mips64\"" >> $config_h |
... | ... | @@ -1974,14 +1974,14 @@ case "$target_arch2" in |
1974 | 1974 | target_phys_bits=64 |
1975 | 1975 | ;; |
1976 | 1976 | ppc) |
1977 | - echo "TARGET_ARCH=ppc" >> $config_mak | |
1977 | + TARGET_ARCH=ppc | |
1978 | 1978 | echo "#define TARGET_ARCH \"ppc\"" >> $config_h |
1979 | 1979 | echo "#define TARGET_PPC 1" >> $config_h |
1980 | 1980 | gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" |
1981 | 1981 | target_phys_bits=32 |
1982 | 1982 | ;; |
1983 | 1983 | ppcemb) |
1984 | - echo "TARGET_ARCH=ppcemb" >> $config_mak | |
1984 | + TARGET_ARCH=ppcemb | |
1985 | 1985 | echo "TARGET_BASE_ARCH=ppc" >> $config_mak |
1986 | 1986 | echo "TARGET_ABI_DIR=ppc" >> $config_mak |
1987 | 1987 | echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h |
... | ... | @@ -1991,7 +1991,7 @@ case "$target_arch2" in |
1991 | 1991 | target_phys_bits=64 |
1992 | 1992 | ;; |
1993 | 1993 | ppc64) |
1994 | - echo "TARGET_ARCH=ppc64" >> $config_mak | |
1994 | + TARGET_ARCH=ppc64 | |
1995 | 1995 | echo "TARGET_BASE_ARCH=ppc" >> $config_mak |
1996 | 1996 | echo "TARGET_ABI_DIR=ppc" >> $config_mak |
1997 | 1997 | echo "#define TARGET_ARCH \"ppc64\"" >> $config_h |
... | ... | @@ -2001,7 +2001,7 @@ case "$target_arch2" in |
2001 | 2001 | target_phys_bits=64 |
2002 | 2002 | ;; |
2003 | 2003 | ppc64abi32) |
2004 | - echo "TARGET_ARCH=ppc64" >> $config_mak | |
2004 | + TARGET_ARCH=ppc64 | |
2005 | 2005 | echo "TARGET_BASE_ARCH=ppc" >> $config_mak |
2006 | 2006 | echo "TARGET_ABI_DIR=ppc" >> $config_mak |
2007 | 2007 | echo "TARGET_ARCH2=ppc64abi32" >> $config_mak |
... | ... | @@ -2013,7 +2013,7 @@ case "$target_arch2" in |
2013 | 2013 | target_phys_bits=64 |
2014 | 2014 | ;; |
2015 | 2015 | sh4|sh4eb) |
2016 | - echo "TARGET_ARCH=sh4" >> $config_mak | |
2016 | + TARGET_ARCH=sh4 | |
2017 | 2017 | echo "TARGET_ARCH2=$target_arch2" >> $config_mak |
2018 | 2018 | echo "#define TARGET_ARCH \"sh4\"" >> $config_h |
2019 | 2019 | echo "#define TARGET_SH4 1" >> $config_h |
... | ... | @@ -2022,13 +2022,13 @@ case "$target_arch2" in |
2022 | 2022 | target_phys_bits=32 |
2023 | 2023 | ;; |
2024 | 2024 | sparc) |
2025 | - echo "TARGET_ARCH=sparc" >> $config_mak | |
2025 | + TARGET_ARCH=sparc | |
2026 | 2026 | echo "#define TARGET_ARCH \"sparc\"" >> $config_h |
2027 | 2027 | echo "#define TARGET_SPARC 1" >> $config_h |
2028 | 2028 | target_phys_bits=64 |
2029 | 2029 | ;; |
2030 | 2030 | sparc64) |
2031 | - echo "TARGET_ARCH=sparc64" >> $config_mak | |
2031 | + TARGET_ARCH=sparc64 | |
2032 | 2032 | echo "TARGET_BASE_ARCH=sparc" >> $config_mak |
2033 | 2033 | echo "#define TARGET_ARCH \"sparc64\"" >> $config_h |
2034 | 2034 | echo "#define TARGET_SPARC 1" >> $config_h |
... | ... | @@ -2037,7 +2037,7 @@ case "$target_arch2" in |
2037 | 2037 | target_phys_bits=64 |
2038 | 2038 | ;; |
2039 | 2039 | sparc32plus) |
2040 | - echo "TARGET_ARCH=sparc64" >> $config_mak | |
2040 | + TARGET_ARCH=sparc64 | |
2041 | 2041 | echo "TARGET_BASE_ARCH=sparc" >> $config_mak |
2042 | 2042 | echo "TARGET_ABI_DIR=sparc" >> $config_mak |
2043 | 2043 | echo "TARGET_ARCH2=$target_arch2" >> $config_mak |
... | ... | @@ -2052,6 +2052,7 @@ case "$target_arch2" in |
2052 | 2052 | exit 1 |
2053 | 2053 | ;; |
2054 | 2054 | esac |
2055 | +echo "TARGET_ARCH=$TARGET_ARCH" >> $config_mak | |
2055 | 2056 | if [ $target_phys_bits -lt $hostlongbits ] ; then |
2056 | 2057 | target_phys_bits=$hostlongbits |
2057 | 2058 | fi | ... | ... |