Commit 6d2fdde4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-100919-2' into staging 



Testing fixes:

  - podman cleanups
  - docker.py python3 fixes (encode)
  - DEF_TARGET_LIST applied to cross build images
  - move a bunch to Buster based images
  - enable Travis caching
  - more common objs for faster builds
  - stable URLs for acceptance tests
  - additional travis dependencies
  - work around ppc64abi32 linux-test breakage [v2]

# gpg: Signature made Tue 10 Sep 2019 14:16:00 BST
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-next-100919-2: (46 commits)
  tests/tcg: fix typo when calling clean-tcg
  travis.yml: Install libcap-dev for testing virito-9p
  Fedora images: use URLs from stable "archives.fedoraproject.org"
  .travis.yml: Cache Linux/Clang jobs together
  .travis.yml: Cache Linux/GCC 'non-debug profile' jobs together
  .travis.yml: Cache Linux/GCC 'debug profile' jobs together
  .travis.yml: Document how the build matrix use caches
  .travis.yml: Enable ccache on OSX
  .travis.yml: Improve ccache use
  .travis.yml: Cache Avocado cache
  .travis.yml: Cache Python PIP packages
  .travis.yml: Increase cache timeout from 3min to 20min
  .travis.yml: Enable multiple caching features
  configure: check if --no-pie is supported first
  tests/docker: --disable-libssh on ubuntu1804 builds
  tests/docker: add more images to PARTIAL_IMAGES when not on x86_64
  tests/docker: use --arch-only for installing deps
  tests/docker: add debian-amd64-cross for non-x86 hosts
  tests/docker: avoid $SHELL invoke bash directly
  tests/docker: add debian9-mxe to DEBIAN_PARTIAL_IMAGES
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 89ea03a7 dda60da3

.shippable.yml

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ env: 
      TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user

build:

  pre_ci:

    # usually host ARCH is set by configure

    - echo "ARCH=$(uname -m)" > config-host.mak

    - make docker-image-${IMAGE} V=1

  pre_ci_boot:

    image_name: qemu

.travis.yml

+39 −1
Original line number Diff line number Diff line
@@ -5,7 +5,18 @@ dist: xenial 
language: c

compiler:

  - gcc

cache: ccache

cache:

  # There is one cache per branch and compiler version.

  # characteristics of each job are used to identify the cache:

  # - OS name (currently, linux, osx, or windows)

  # - OS distribution (for Linux, xenial, trusty, or precise)

  # - macOS image name (e.g., xcode7.2)

  # - Names and values of visible environment variables set in .travis.yml or Settings panel

  timeout: 1200

  ccache: true

  pip: true

  directories:

  - $HOME/avocado/data/cache





addons:
@@ -15,6 +26,7 @@ addons: 
      - libaio-dev

      - libattr1-dev

      - libbrlapi-dev

      - libcap-dev

      - libcap-ng-dev

      - libgcc-4.8-dev

      - libgnutls-dev
@@ -40,6 +52,7 @@ addons: 
      - gcovr

  homebrew:

    packages:

      - ccache

      - glib

      - pixman

      - gnu-sed
@@ -65,6 +78,9 @@ env: 
    - TEST_CMD="make check -j3 V=1"

    # This is broadly a list of "mainline" softmmu targets which have support across the major distros

    - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"

    - CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime"

    - CCACHE_MAXSIZE=1G





git:

  # we want to do this ourselves
@@ -72,25 +88,32 @@ git: 




before_script:

  - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi

  - command -v ccache && ccache --zero-stats

  - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}

  - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }

script:

  - make -j3 && travis_retry ${TEST_CMD}

after_script:

  - command -v ccache && ccache --show-stats





matrix:

  include:

    - env:

        - CONFIG="--disable-system --static"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"





    # we split the system builds as it takes a while to build them all

    - env:

        - CONFIG="--disable-user --target-list=${MAIN_SOFTMMU_TARGETS}"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"





    - env:

        - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"





    # Just build tools and run minimal unit and softfloat checks
@@ -98,14 +121,18 @@ matrix: 
        - BASE_CONFIG="--enable-tools"

        - CONFIG="--disable-user --disable-system"

        - TEST_CMD="make check-unit check-softfloat -j3"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"





    - env:

        - CONFIG="--enable-debug --enable-debug-tcg --disable-user"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug"





    # TCG debug can be run just on it's own and is mostly agnostic to user/softmmu distinctions

    - env:

        - CONFIG="--enable-debug-tcg --disable-system"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug"





    - env:
@@ -115,6 +142,7 @@ matrix: 
    # Module builds are mostly of interest to major distros

    - env:

        - CONFIG="--enable-modules --target-list=${MAIN_SOFTMMU_TARGETS}"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"





    # Alternate coroutines implementations are only really of interest to KVM users
@@ -134,6 +162,7 @@ matrix: 
        - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.."

        - BASE_CONFIG="--enable-tools --enable-docs"

        - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"

      addons:

        apt:

          packages:
@@ -145,11 +174,13 @@ matrix: 
    # Test with Clang for compile portability (Travis uses clang-5.0)

    - env:

        - CONFIG="--disable-system"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default"

      compiler: clang





    - env:

        - CONFIG="--disable-user --target-list=${MAIN_SOFTMMU_TARGETS}"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default"

      compiler: clang
@@ -162,6 +193,7 @@ matrix: 


    - env:

        - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default"

      compiler: clang
@@ -175,6 +207,7 @@ matrix: 
    # We manually include builds which we disable "make check" for

    - env:

        - CONFIG="--without-default-devices --disable-user"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"

        - TEST_CMD=""
@@ -218,6 +251,7 @@ matrix: 
    # Python builds

    - env:

        - CONFIG="--target-list=x86_64-softmmu"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"

      language: python

      python:

        - "3.4"
@@ -225,6 +259,7 @@ matrix: 


    - env:

        - CONFIG="--target-list=x86_64-softmmu"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"

      language: python

      python:

        - "3.6"
@@ -296,8 +331,11 @@ matrix: 
    - env:

        - CONFIG="--disable-system"

        - TEST_CMD="make -j3 check-tcg V=1"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"





    # Run check-tcg against softmmu targets

    - env:

        - CONFIG="--target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu"

        - TEST_CMD="make -j3 check-tcg V=1"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -717,6 +717,7 @@ endef 


distclean: clean

	rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi

	rm -f tests/tcg/config-*.mak

	rm -f config-all-devices.mak config-all-disas.mak config.status

	rm -f $(SUBDIR_DEVICES_MAK)

	rm -f po/*.mo tests/qemu-iotests/common.env

Makefile.target

+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ endif 
PROGS=$(QEMU_PROG) $(QEMU_PROGW)

STPFILES=



# Makefile Tests

include $(SRC_PATH)/tests/tcg/Makefile.include



config-target.h: config-target.h-timestamp

config-target.h-timestamp: config-target.mak

configure

+21 −147
Original line number Diff line number Diff line
@@ -495,27 +495,10 @@ qed="yes" 
parallels="yes"

sheepdog="yes"

libxml2=""

docker="no"

debug_mutex="no"

libpmem=""

default_devices="yes"



# cross compilers defaults, can be overridden with --cross-cc-ARCH

cross_cc_aarch64="aarch64-linux-gnu-gcc"

cross_cc_aarch64_be="$cross_cc_aarch64"

cross_cc_cflags_aarch64_be="-mbig-endian"

cross_cc_arm="arm-linux-gnueabihf-gcc"

cross_cc_cflags_armeb="-mbig-endian"

cross_cc_i386="i386-pc-linux-gnu-gcc"

cross_cc_cflags_i386=""

cross_cc_ppc="powerpc-linux-gnu-gcc"

cross_cc_cflags_ppc="-m32"

cross_cc_ppc64="powerpc-linux-gnu-gcc"

cross_cc_cflags_ppc64="-m64"

cross_cc_ppc64le="powerpc64le-linux-gnu-gcc"



enabled_cross_compilers=""



supported_cpu="no"

supported_os="no"

bogus_os="no"
@@ -548,9 +531,12 @@ for opt do 
  ;;

  --cross-cc-cflags-*) cc_arch=${opt#--cross-cc-flags-}; cc_arch=${cc_arch%%=*}

                      eval "cross_cc_cflags_${cc_arch}=\$optarg"

                      cross_cc_vars="$cross_cc_vars cross_cc_cflags_${cc_arch}"

  ;;

  --cross-cc-*) cc_arch=${opt#--cross-cc-}; cc_arch=${cc_arch%%=*}

                cc_archs="$cc_archs $cc_arch"

                eval "cross_cc_${cc_arch}=\$optarg"

                cross_cc_vars="$cross_cc_vars cross_cc_${cc_arch}"

  ;;

  esac

done
@@ -745,42 +731,34 @@ ARCH= 
case "$cpu" in

  ppc|ppc64|s390|s390x|sparc64|x32|riscv32|riscv64)

    supported_cpu="yes"

    eval "cross_cc_${cpu}=\$host_cc"

  ;;

  ppc64le)

    ARCH="ppc64"

    supported_cpu="yes"

    cross_cc_ppc64le=$host_cc

  ;;

  i386|i486|i586|i686|i86pc|BePC)

    cpu="i386"

    supported_cpu="yes"

    cross_cc_i386=$host_cc

  ;;

  x86_64|amd64)

    cpu="x86_64"

    supported_cpu="yes"

    cross_cc_x86_64=$host_cc

  ;;

  armv*b|armv*l|arm)

    cpu="arm"

    supported_cpu="yes"

    cross_cc_arm=$host_cc

  ;;

  aarch64)

    cpu="aarch64"

    supported_cpu="yes"

    cross_cc_aarch64=$host_cc

  ;;

  mips*)

    cpu="mips"

    supported_cpu="yes"

    cross_cc_mips=$host_cc

  ;;

  sparc|sun4[cdmuv])

    cpu="sparc"

    supported_cpu="yes"

    cross_cc_sparc=$host_cc

  ;;

  *)

    # This will result in either an error or falling back to TCI later
@@ -1555,44 +1533,30 @@ case "$cpu" in 
    ppc)

           CPU_CFLAGS="-m32"

           LDFLAGS="-m32 $LDFLAGS"

           cross_cc_ppc=$cc

           cross_cc_cflags_ppc="$CPU_CFLAGS"

           ;;

    ppc64)

           CPU_CFLAGS="-m64"

           LDFLAGS="-m64 $LDFLAGS"

           cross_cc_ppc64=$cc

           cross_cc_cflags_ppc64="$CPU_CFLAGS"

           ;;

    sparc)

           CPU_CFLAGS="-m32 -mv8plus -mcpu=ultrasparc"

           LDFLAGS="-m32 -mv8plus $LDFLAGS"

           cross_cc_sparc=$cc

           cross_cc_cflags_sparc="$CPU_CFLAGS"

           ;;

    sparc64)

           CPU_CFLAGS="-m64 -mcpu=ultrasparc"

           LDFLAGS="-m64 $LDFLAGS"

           cross_cc_sparc64=$cc

           cross_cc_cflags_sparc64="$CPU_CFLAGS"

           ;;

    s390)

           CPU_CFLAGS="-m31"

           LDFLAGS="-m31 $LDFLAGS"

           cross_cc_s390=$cc

           cross_cc_cflags_s390="$CPU_CFLAGS"

           ;;

    s390x)

           CPU_CFLAGS="-m64"

           LDFLAGS="-m64 $LDFLAGS"

           cross_cc_s390x=$cc

           cross_cc_cflags_s390x="$CPU_CFLAGS"

           ;;

    i386)

           CPU_CFLAGS="-m32"

           LDFLAGS="-m32 $LDFLAGS"

           cross_cc_i386=$cc

           cross_cc_cflags_i386="$CPU_CFLAGS"

           ;;

    x86_64)

           # ??? Only extremely old AMD cpus do not have cmpxchg16b.
@@ -1600,18 +1564,16 @@ case "$cpu" in 
           # runtime and generate the fallback to serial emulation.

           CPU_CFLAGS="-m64 -mcx16"

           LDFLAGS="-m64 $LDFLAGS"

           cross_cc_x86_64=$cc

           cross_cc_cflags_x86_64="$CPU_CFLAGS"

           ;;

    x32)

           CPU_CFLAGS="-mx32"

           LDFLAGS="-mx32 $LDFLAGS"

           cross_cc_i386=$cc

           cross_cc_cflags_i386="$CPU_CFLAGS"

           ;;

    # No special flags required for other host CPUs

esac



eval "cross_cc_${cpu}=\$host_cc"

cross_cc_vars="$cross_cc_vars cross_cc_${cpu}"

QEMU_CFLAGS="$CPU_CFLAGS $QEMU_CFLAGS"



# For user-mode emulation the host arch has to be one we explicitly
@@ -2059,6 +2021,12 @@ static THREAD int tls_var; 
int main(void) { return tls_var; }



EOF

  # check we support --no-pie first...

  if compile_prog "-Werror -fno-pie" "-no-pie"; then

    CFLAGS_NOPIE="-fno-pie"

    LDFLAGS_NOPIE="-nopie"

  fi



  if compile_prog "-fPIE -DPIE" "-pie"; then

    QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"

    LDFLAGS="-pie $LDFLAGS"
@@ -2074,11 +2042,6 @@ EOF 
      pie="no"

    fi

  fi



  if compile_prog "-Werror -fno-pie" "-nopie"; then

    CFLAGS_NOPIE="-fno-pie"

    LDFLAGS_NOPIE="-nopie"

  fi

fi



##########################################
@@ -5893,17 +5856,6 @@ EOF 
  fi

fi



##########################################

# Docker and cross-compiler support

#

# This is specifically for building test

# cases for foreign architectures, not

# cross-compiling QEMU itself.



if has "docker"; then

    docker=$($python $source_path/tests/docker/docker.py probe)

fi



##########################################

# check for libpmem
@@ -6474,7 +6426,6 @@ echo "qed support $qed" 
echo "parallels support $parallels"

echo "sheepdog support  $sheepdog"

echo "capstone          $capstone"

echo "docker            $docker"

echo "libpmem support   $libpmem"

echo "libudev           $libudev"

echo "default devices   $default_devices"
@@ -7384,10 +7335,6 @@ if test "$gcov" = "yes" ; then 
  echo "GCOV=$gcov_tool" >> $config_host_mak

fi



if test "$docker" != "no"; then

    echo "HAVE_USER_DOCKER=y" >> $config_host_mak

fi



if test "$libudev" != "no"; then

    echo "CONFIG_LIBUDEV=y" >> $config_host_mak

    echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak
@@ -7461,10 +7408,6 @@ case "$target" in 
    ;;

esac



target_compiler=""

target_compiler_static=""

target_compiler_cflags=""



mkdir -p $target_dir

echo "# Automatically generated by configure - do not modify" > $config_target_mak
@@ -7481,26 +7424,20 @@ case "$target_name" in 
  i386)

    mttcg="yes"

	gdb_xml_files="i386-32bit.xml"

    target_compiler=$cross_cc_i386

    target_compiler_cflags=$cross_cc_ccflags_i386

  ;;

  x86_64)

    TARGET_BASE_ARCH=i386

    mttcg="yes"

	gdb_xml_files="i386-64bit.xml"

    target_compiler=$cross_cc_x86_64

  ;;

  alpha)

    mttcg="yes"

    target_compiler=$cross_cc_alpha

  ;;

  arm|armeb)

    TARGET_ARCH=arm

    bflt="yes"

    mttcg="yes"

    gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"

    target_compiler=$cross_cc_arm

    eval "target_compiler_cflags=\$cross_cc_cflags_${target_name}"

  ;;

  aarch64|aarch64_be)

    TARGET_ARCH=aarch64
@@ -7508,41 +7445,32 @@ case "$target_name" in 
    bflt="yes"

    mttcg="yes"

    gdb_xml_files="aarch64-core.xml aarch64-fpu.xml arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"

    target_compiler=$cross_cc_aarch64

    eval "target_compiler_cflags=\$cross_cc_cflags_${target_name}"

  ;;

  cris)

    target_compiler=$cross_cc_cris

  ;;

  hppa)

    mttcg="yes"

    target_compiler=$cross_cc_hppa

  ;;

  lm32)

    target_compiler=$cross_cc_lm32

  ;;

  m68k)

    bflt="yes"

    gdb_xml_files="cf-core.xml cf-fp.xml m68k-fp.xml"

    target_compiler=$cross_cc_m68k

  ;;

  microblaze|microblazeel)

    TARGET_ARCH=microblaze

    bflt="yes"

    echo "TARGET_ABI32=y" >> $config_target_mak

    target_compiler=$cross_cc_microblaze

  ;;

  mips|mipsel)

    mttcg="yes"

    TARGET_ARCH=mips

    target_compiler=$cross_cc_mips

    echo "TARGET_ABI_MIPSO32=y" >> $config_target_mak

  ;;

  mipsn32|mipsn32el)

    mttcg="yes"

    TARGET_ARCH=mips64

    TARGET_BASE_ARCH=mips

    target_compiler=$cross_cc_mipsn32

    echo "TARGET_ABI_MIPSN32=y" >> $config_target_mak

    echo "TARGET_ABI32=y" >> $config_target_mak

  ;;
@@ -7550,32 +7478,24 @@ case "$target_name" in 
    mttcg="yes"

    TARGET_ARCH=mips64

    TARGET_BASE_ARCH=mips

    target_compiler=$cross_cc_mips64

    echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak

  ;;

  moxie)

    target_compiler=$cross_cc_moxie

  ;;

  nios2)

    target_compiler=$cross_cc_nios2

  ;;

  or1k)

    target_compiler=$cross_cc_or1k

    TARGET_ARCH=openrisc

    TARGET_BASE_ARCH=openrisc

  ;;

  ppc)

    gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"

    target_compiler=$cross_cc_ppc

    target_compiler_cflags="$cross_cc_cflags_ppc"

  ;;

  ppc64)

    TARGET_BASE_ARCH=ppc

    TARGET_ABI_DIR=ppc

    mttcg=yes

    gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml"

    target_compiler=$cross_cc_ppc64

    target_compiler_cflags="$cross_cc_cflags_ppc64"

  ;;

  ppc64le)

    TARGET_ARCH=ppc64
@@ -7583,7 +7503,6 @@ case "$target_name" in 
    TARGET_ABI_DIR=ppc

    mttcg=yes

    gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml"

    target_compiler=$cross_cc_ppc64le

  ;;

  ppc64abi32)

    TARGET_ARCH=ppc64
@@ -7591,60 +7510,48 @@ case "$target_name" in 
    TARGET_ABI_DIR=ppc

    echo "TARGET_ABI32=y" >> $config_target_mak

    gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml"

    target_compiler=$cross_cc_ppc64abi32

  ;;

  riscv32)

    TARGET_BASE_ARCH=riscv

    TARGET_ABI_DIR=riscv

    mttcg=yes

    gdb_xml_files="riscv-32bit-cpu.xml riscv-32bit-fpu.xml riscv-32bit-csr.xml"

    target_compiler=$cross_cc_riscv32

  ;;

  riscv64)

    TARGET_BASE_ARCH=riscv

    TARGET_ABI_DIR=riscv

    mttcg=yes

    gdb_xml_files="riscv-64bit-cpu.xml riscv-64bit-fpu.xml riscv-64bit-csr.xml"

    target_compiler=$cross_cc_riscv64

  ;;

  sh4|sh4eb)

    TARGET_ARCH=sh4

    bflt="yes"

    target_compiler=$cross_cc_sh4

  ;;

  sparc)

    target_compiler=$cross_cc_sparc

  ;;

  sparc64)

    TARGET_BASE_ARCH=sparc

    target_compiler=$cross_cc_sparc64

  ;;

  sparc32plus)

    TARGET_ARCH=sparc64

    TARGET_BASE_ARCH=sparc

    TARGET_ABI_DIR=sparc

    target_compiler=$cross_cc_sparc32plus

    echo "TARGET_ABI32=y" >> $config_target_mak

  ;;

  s390x)

    mttcg=yes

    gdb_xml_files="s390x-core64.xml s390-acr.xml s390-fpr.xml s390-vx.xml s390-cr.xml s390-virt.xml s390-gs.xml"

    target_compiler=$cross_cc_s390x

  ;;

  tilegx)

    target_compiler=$cross_cc_tilegx

  ;;

  tricore)

    target_compiler=$cross_cc_tricore

  ;;

  unicore32)

    target_compiler=$cross_cc_unicore32

  ;;

  xtensa|xtensaeb)

    TARGET_ARCH=xtensa

    bflt="yes"

    mttcg="yes"

    target_compiler=$cross_cc_xtensa

  ;;

  *)

    error_exit "Unsupported target CPU"
@@ -7655,27 +7562,6 @@ if [ "$TARGET_BASE_ARCH" = "" ]; then 
  TARGET_BASE_ARCH=$TARGET_ARCH

fi



# Do we have a cross compiler for this target?

if has $target_compiler; then



    write_c_skeleton



    if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TMPE $TMPC -static ; then

        # For host systems we might get away with building without -static

        if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TMPE $TMPC ; then

            target_compiler=""

        else

            enabled_cross_compilers="${enabled_cross_compilers} '${target_compiler}'"

            target_compiler_static="n"

        fi

    else

        enabled_cross_compilers="${enabled_cross_compilers} '${target_compiler}'"

        target_compiler_static="y"

    fi

else

    target_compiler=""

fi



symlink "$source_path/Makefile.target" "$target_dir/Makefile"



upper() {
@@ -7752,18 +7638,6 @@ if test "$target_bsd_user" = "yes" ; then 
  echo "CONFIG_BSD_USER=y" >> $config_target_mak

fi



if test -n "$target_compiler"; then

  echo "CROSS_CC_GUEST=\"$target_compiler\"" >> $config_target_mak



  if test -n "$target_compiler_static"; then

      echo "CROSS_CC_GUEST_STATIC=$target_compiler_static" >> $config_target_mak

  fi



  if test -n "$target_compiler_cflags"; then

      echo "CROSS_CC_GUEST_CFLAGS=$target_compiler_cflags" >> $config_target_mak

  fi

fi





# generate QEMU_CFLAGS/LDFLAGS for targets
@@ -7894,11 +7768,6 @@ done # for target in $targets 
echo "PIXMAN_CFLAGS=$pixman_cflags" >> $config_host_mak

echo "PIXMAN_LIBS=$pixman_libs" >> $config_host_mak



if test -n "$enabled_cross_compilers"; then

    echo

    echo "NOTE: cross-compilers enabled: $enabled_cross_compilers"

fi



if [ "$fdt" = "git" ]; then

  echo "config-host.h: dtc/all" >> $config_host_mak

fi
@@ -7927,15 +7796,14 @@ fi 
# so the build tree will be missing the link back to the new file, and

# tests might fail. Prefer to keep the relevant files in their own

# directory and symlink the directory instead.

DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests tests/vm"

DIRS="tests tests/tcg tests/tcg/lm32 tests/libqos tests/qapi-schema tests/qemu-iotests tests/vm"

DIRS="$DIRS tests/fp tests/qgraph"

DIRS="$DIRS docs docs/interop fsdev scsi"

DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"

DIRS="$DIRS roms/seabios roms/vgabios"

LINKS="Makefile tests/tcg/Makefile"

LINKS="$LINKS tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"

LINKS="$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile"

LINKS="$LINKS tests/fp/Makefile"

LINKS="Makefile"

LINKS="$LINKS tests/tcg/lm32/Makefile po/Makefile"

LINKS="$LINKS tests/tcg/Makefile.target tests/fp/Makefile"

LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps"

LINKS="$LINKS pc-bios/spapr-rtas/Makefile"

LINKS="$LINKS pc-bios/s390-ccw/Makefile"
@@ -7965,6 +7833,12 @@ for f in $LINKS ; do 
    fi

done



(for i in $cross_cc_vars; do

  export $i

done

export target_list source_path

$source_path/tests/tcg/configure.sh)



# temporary config to build submodules

for rom in seabios vgabios ; do

    config_mak=roms/$rom/config.mak