gwj / at91sam9263 · Commits

Commit 0adcffb1ce23b34ea26b05a75c711904db362ffa

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 6acff7da

simplify TARGET_ARCH2 generation 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 2 changed files with 2 additions and 12 deletions
Makefile.target
  View file @0adcffb
@@ -6,10 +6,6 @@ VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw @@ -6,10 +6,6 @@ VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
6 CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H 6 CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
7 #CFLAGS+=-Werror 7 #CFLAGS+=-Werror
8 LIBS= 8 LIBS=
9 -# user emulator name  
10 -ifndef TARGET_ARCH2  
11 -TARGET_ARCH2=$(TARGET_ARCH)  
12 -endif  
13 9
14 ifdef CONFIG_USER_ONLY 10 ifdef CONFIG_USER_ONLY
15 # user emulator name 11 # user emulator name
configure
  View file @0adcffb
@@ -1907,7 +1907,6 @@ case &quot;$target_arch2&quot; in @@ -1907,7 +1907,6 @@ case &quot;$target_arch2&quot; in
1907 ;; 1907 ;;
1908 arm|armeb) 1908 arm|armeb)
1909 TARGET_ARCH=arm 1909 TARGET_ARCH=arm
1910 - echo "TARGET_ARCH2=$target_arch2" >> $config_mak  
1911 bflt="yes" 1910 bflt="yes"
1912 target_nptl="yes" 1911 target_nptl="yes"
1913 gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml" 1912 gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"
@@ -1927,23 +1926,20 @@ case &quot;$target_arch2&quot; in @@ -1927,23 +1926,20 @@ case &quot;$target_arch2&quot; in
1927 target_nptl="yes" 1926 target_nptl="yes"
1928 target_phys_bits=32 1927 target_phys_bits=32
1929 ;; 1928 ;;
1930 - mips|mipsel) 1929 + mips|mipsel)
1931 TARGET_ARCH=mips 1930 TARGET_ARCH=mips
1932 - echo "TARGET_ARCH2=$target_arch2" >> $config_mak  
1933 echo "#define TARGET_ABI_MIPSO32 1" >> $config_h 1931 echo "#define TARGET_ABI_MIPSO32 1" >> $config_h
1934 target_nptl="yes" 1932 target_nptl="yes"
1935 target_phys_bits=64 1933 target_phys_bits=64
1936 ;; 1934 ;;
1937 mipsn32|mipsn32el) 1935 mipsn32|mipsn32el)
1938 TARGET_ARCH=mipsn32 1936 TARGET_ARCH=mipsn32
1939 - echo "TARGET_ARCH2=$target_arch2" >> $config_mak  
1940 TARGET_BASE_ARCH=mips 1937 TARGET_BASE_ARCH=mips
1941 echo "#define TARGET_ABI_MIPSN32 1" >> $config_h 1938 echo "#define TARGET_ABI_MIPSN32 1" >> $config_h
1942 target_phys_bits=64 1939 target_phys_bits=64
1943 ;; 1940 ;;
1944 mips64|mips64el) 1941 mips64|mips64el)
1945 TARGET_ARCH=mips64 1942 TARGET_ARCH=mips64
1946 - echo "TARGET_ARCH2=$target_arch2" >> $config_mak  
1947 TARGET_BASE_ARCH=mips 1943 TARGET_BASE_ARCH=mips
1948 echo "#define TARGET_ABI_MIPSN64 1" >> $config_h 1944 echo "#define TARGET_ABI_MIPSN64 1" >> $config_h
1949 target_phys_bits=64 1945 target_phys_bits=64
@@ -1968,14 +1964,12 @@ case &quot;$target_arch2&quot; in @@ -1968,14 +1964,12 @@ case &quot;$target_arch2&quot; in
1968 TARGET_ARCH=ppc64 1964 TARGET_ARCH=ppc64
1969 TARGET_BASE_ARCH=ppc 1965 TARGET_BASE_ARCH=ppc
1970 echo "TARGET_ABI_DIR=ppc" >> $config_mak 1966 echo "TARGET_ABI_DIR=ppc" >> $config_mak
1971 - echo "TARGET_ARCH2=ppc64abi32" >> $config_mak  
1972 echo "#define TARGET_ABI32 1" >> $config_h 1967 echo "#define TARGET_ABI32 1" >> $config_h
1973 gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml" 1968 gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
1974 target_phys_bits=64 1969 target_phys_bits=64
1975 ;; 1970 ;;
1976 sh4|sh4eb) 1971 sh4|sh4eb)
1977 TARGET_ARCH=sh4 1972 TARGET_ARCH=sh4
1978 - echo "TARGET_ARCH2=$target_arch2" >> $config_mak  
1979 bflt="yes" 1973 bflt="yes"
1980 target_nptl="yes" 1974 target_nptl="yes"
1981 target_phys_bits=32 1975 target_phys_bits=32
@@ -1992,7 +1986,6 @@ case &quot;$target_arch2&quot; in @@ -1992,7 +1986,6 @@ case &quot;$target_arch2&quot; in
1992 TARGET_ARCH=sparc64 1986 TARGET_ARCH=sparc64
1993 TARGET_BASE_ARCH=sparc 1987 TARGET_BASE_ARCH=sparc
1994 echo "TARGET_ABI_DIR=sparc" >> $config_mak 1988 echo "TARGET_ABI_DIR=sparc" >> $config_mak
1995 - echo "TARGET_ARCH2=$target_arch2" >> $config_mak  
1996 echo "#define TARGET_ABI32 1" >> $config_h 1989 echo "#define TARGET_ABI32 1" >> $config_h
1997 target_phys_bits=64 1990 target_phys_bits=64
1998 ;; 1991 ;;
@@ -2002,6 +1995,7 @@ case &quot;$target_arch2&quot; in @@ -2002,6 +1995,7 @@ case &quot;$target_arch2&quot; in
2002 ;; 1995 ;;
2003 esac 1996 esac
2004 echo "TARGET_ARCH=$TARGET_ARCH" >> $config_mak 1997 echo "TARGET_ARCH=$TARGET_ARCH" >> $config_mak
  1998 +echo "TARGET_ARCH2=$target_arch2" >> $config_mak
2005 echo "#define TARGET_ARCH \"$TARGET_ARCH\"" >> $config_h 1999 echo "#define TARGET_ARCH \"$TARGET_ARCH\"" >> $config_h
2006 target_arch_name=`echo $TARGET_ARCH | tr '[:lower:]' '[:upper:]'` 2000 target_arch_name=`echo $TARGET_ARCH | tr '[:lower:]' '[:upper:]'`
2007 echo "#define TARGET_$target_arch_name 1" >> $config_h 2001 echo "#define TARGET_$target_arch_name 1" >> $config_h