gwj / at91sam9263 · Commits

Commit e6e91b9c3df94e5688147c37ac43066344457cb0

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

simplify TARGET_ABI_DIR 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 9 additions and 7 deletions
Makefile.target
  View file @e6e91b9
... ... @@ -172,9 +172,6 @@ cpu-exec.o: CFLAGS += $(HELPER_CFLAGS)
172 172  
173 173 ifdef CONFIG_LINUX_USER
174 174  
175   -ifndef TARGET_ABI_DIR
176   - TARGET_ABI_DIR=$(TARGET_ARCH)
177   -endif
178 175 VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
179 176 CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
180 177  
... ...
configure
  View file @e6e91b9
... ... @@ -1893,6 +1893,7 @@ gdb_xml_files=&quot;&quot;
1893 1893  
1894 1894 TARGET_ARCH="$target_arch2"
1895 1895 TARGET_BASE_ARCH=""
  1896 +TARGET_ABI_DIR=""
1896 1897  
1897 1898 case "$target_arch2" in
1898 1899 i386)
... ... @@ -1950,20 +1951,20 @@ case &quot;$target_arch2&quot; in
1950 1951 ;;
1951 1952 ppcemb)
1952 1953 TARGET_BASE_ARCH=ppc
1953   - echo "TARGET_ABI_DIR=ppc" >> $config_mak
  1954 + TARGET_ABI_DIR=ppc
1954 1955 gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
1955 1956 target_phys_bits=64
1956 1957 ;;
1957 1958 ppc64)
1958 1959 TARGET_BASE_ARCH=ppc
1959   - echo "TARGET_ABI_DIR=ppc" >> $config_mak
  1960 + TARGET_ABI_DIR=ppc
1960 1961 gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
1961 1962 target_phys_bits=64
1962 1963 ;;
1963 1964 ppc64abi32)
1964 1965 TARGET_ARCH=ppc64
1965 1966 TARGET_BASE_ARCH=ppc
1966   - echo "TARGET_ABI_DIR=ppc" >> $config_mak
  1967 + TARGET_ABI_DIR=ppc
1967 1968 echo "#define TARGET_ABI32 1" >> $config_h
1968 1969 gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
1969 1970 target_phys_bits=64
... ... @@ -1985,7 +1986,7 @@ case &quot;$target_arch2&quot; in
1985 1986 sparc32plus)
1986 1987 TARGET_ARCH=sparc64
1987 1988 TARGET_BASE_ARCH=sparc
1988   - echo "TARGET_ABI_DIR=sparc" >> $config_mak
  1989 + TARGET_ABI_DIR=sparc
1989 1990 echo "#define TARGET_ABI32 1" >> $config_h
1990 1991 target_phys_bits=64
1991 1992 ;;
... ... @@ -2006,6 +2007,10 @@ else
2006 2007 echo "#define TARGET_$target_base_arch_name 1" >> $config_h
2007 2008 fi
2008 2009 echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_mak
  2010 +if [ "$TARGET_ABI_DIR" = "" ]; then
  2011 + TARGET_ABI_DIR=$TARGET_ARCH
  2012 +fi
  2013 +echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_mak
2009 2014 if [ $target_phys_bits -lt $hostlongbits ] ; then
2010 2015 target_phys_bits=$hostlongbits
2011 2016 fi
... ...