block: Remove deprecated -drive option addr

[qemu.git] / configure

diff --git a/configure b/configure
index a71bf9b00b3cd3bf201e1851dd209076d3c5c121..2a7796ea80b4acba250009fa8a0cbb96eabae989 100755 (executable)
--- a/configure
+++ b/configure
@@ -289,7 +289,6 @@ libs_softmmu=""
 libs_tools=""
 audio_pt_int=""
 audio_win_int=""
 libs_tools=""
 audio_pt_int=""
 audio_win_int=""

-cc_i386=i386-pc-linux-gnu-gcc

 libs_qga=""
 debug_info="yes"
 stack_protector=""
 libs_qga=""
 debug_info="yes"
 stack_protector=""


@@ -301,6 +300,24 @@ then
 else
     git_update=no
     git_submodules=""
 else
     git_update=no
     git_submodules=""

+
+    if ! test -f "$source_path/ui/keycodemapdb/README"
+    then
+        echo
+        echo "ERROR: missing file $source_path/ui/keycodemapdb/README"
+        echo
+        echo "This is not a GIT checkout but module content appears to"
+        echo "be missing. Do not use 'git archive' or GitHub download links"
+        echo "to acquire QEMU source archives. Non-GIT builds are only"
+        echo "supported with source archives linked from:"
+        echo
+        echo "  https://www.qemu.org/download/"
+        echo
+        echo "Developers working with GIT can use scripts/archive-source.sh"
+        echo "if they need to create valid source archives."
+        echo
+        exit 1
+    fi

 fi
 git="git"
 
 fi
 git="git"
 


@@ -456,6 +473,21 @@ jemalloc="no"
 replication="yes"
 vxhs=""
 libxml2=""
 replication="yes"
 vxhs=""
 libxml2=""

+docker="no"
+debug_mutex="no"
+
+# 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_powerpc="powerpc-linux-gnu-gcc"
+cross_cc_powerpc="powerpc-linux-gnu-gcc"
+
+enabled_cross_compilers=""

 
 supported_cpu="no"
 supported_os="no"
 
 supported_cpu="no"
 supported_os="no"


@@ -487,6 +519,14 @@ for opt do
   ;;
   --disable-debug-info) debug_info="no"
   ;;
   ;;
   --disable-debug-info) debug_info="no"
   ;;

+  --cross-cc-*[!a-zA-Z0-9_-]*=*) error_exit "Passed bad --cross-cc-FOO option"
+  ;;
+  --cross-cc-cflags-*) cc_arch=${opt#--cross-cc-flags-}; cc_arch=${cc_arch%%=*}
+                      eval "cross_cc_cflags_${cc_arch}=\$optarg"
+  ;;
+  --cross-cc-*) cc_arch=${opt#--cross-cc-}; cc_arch=${cc_arch%%=*}
+                eval "cross_cc_${cc_arch}=\$optarg"
+  ;;

   esac
 done
 # OS specific
   esac
 done
 # OS specific


@@ -675,30 +715,37 @@ case "$cpu" in
   ppc|ppc64|s390|s390x|sparc64|x32)
     cpu="$cpu"
     supported_cpu="yes"
   ppc|ppc64|s390|s390x|sparc64|x32)
     cpu="$cpu"
     supported_cpu="yes"

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

   ;;
   i386|i486|i586|i686|i86pc|BePC)
     cpu="i386"
     supported_cpu="yes"
   ;;
   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"
   ;;
   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"
   ;;
   armv*b|armv*l|arm)
     cpu="arm"
     supported_cpu="yes"

+    cross_cc_arm=$host_cc

   ;;
   aarch64)
     cpu="aarch64"
     supported_cpu="yes"
   ;;
   aarch64)
     cpu="aarch64"
     supported_cpu="yes"

+    cross_cc_aarch64=$host_cc

   ;;
   mips*)
     cpu="mips"
     supported_cpu="yes"
   ;;
   mips*)
     cpu="mips"
     supported_cpu="yes"

+    cross_cc_mips=$host_cc

   ;;
   sparc|sun4[cdmuv])
     cpu="sparc"
     supported_cpu="yes"
   ;;
   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
   ;;
   *)
     # This will result in either an error or falling back to TCI later


@@ -916,6 +963,8 @@ for opt do
   ;;
   --disable-debug-info)
   ;;
   ;;
   --disable-debug-info)
   ;;

+  --cross-cc-*)
+  ;;

   --enable-modules)
       modules="yes"
   ;;
   --enable-modules)
       modules="yes"
   ;;


@@ -1011,6 +1060,7 @@ for opt do
   --enable-debug)
       # Enable debugging options that aren't excessively noisy
       debug_tcg="yes"
   --enable-debug)
       # Enable debugging options that aren't excessively noisy
       debug_tcg="yes"

+      debug_mutex="yes"

       debug="yes"
       strip_opt="no"
       fortify_source="no"
       debug="yes"
       strip_opt="no"
       fortify_source="no"


@@ -1381,6 +1431,10 @@ for opt do
   ;;
   --disable-git-update) git_update=no
   ;;
   ;;
   --disable-git-update) git_update=no
   ;;

+  --enable-debug-mutex) debug_mutex=yes
+  ;;
+  --disable-debug-mutex) debug_mutex=no
+  ;;

   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"
   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"


@@ -1401,31 +1455,44 @@ case "$cpu" in
     ppc)
            CPU_CFLAGS="-m32"
            LDFLAGS="-m32 $LDFLAGS"
     ppc)
            CPU_CFLAGS="-m32"
            LDFLAGS="-m32 $LDFLAGS"

+           cross_cc_powerpc=$cc
+           cross_cc_cflags_powerpc=$CPU_CFLAGS

            ;;
     ppc64)
            CPU_CFLAGS="-m64"
            LDFLAGS="-m64 $LDFLAGS"
            ;;
     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"
            ;;
     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"
            ;;
     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"
            ;;
     s390)
            CPU_CFLAGS="-m31"
            LDFLAGS="-m31 $LDFLAGS"

+           cross_cc_s390=$cc
+           cross_cc_cflags_s390=$CPU_CFLAGS

            ;;
     s390x)
            CPU_CFLAGS="-m64"
            LDFLAGS="-m64 $LDFLAGS"
            ;;
     s390x)
            CPU_CFLAGS="-m64"
            LDFLAGS="-m64 $LDFLAGS"

+           cross_cc_s390x=$cc
+           cross_cc_cflags_s390x=$CPU_CFLAGS

            ;;
     i386)
            CPU_CFLAGS="-m32"
            LDFLAGS="-m32 $LDFLAGS"
            ;;
     i386)
            CPU_CFLAGS="-m32"
            LDFLAGS="-m32 $LDFLAGS"

-           cc_i386='$(CC) -m32'
+           cross_cc_i386=$cc
+           cross_cc_cflags_i386=$CPU_CFLAGS

            ;;
     x86_64)
            # ??? Only extremely old AMD cpus do not have cmpxchg16b.
            ;;
     x86_64)
            # ??? Only extremely old AMD cpus do not have cmpxchg16b.


@@ -1433,12 +1500,14 @@ case "$cpu" in
            # runtime and generate the fallback to serial emulation.
            CPU_CFLAGS="-m64 -mcx16"
            LDFLAGS="-m64 $LDFLAGS"
            # runtime and generate the fallback to serial emulation.
            CPU_CFLAGS="-m64 -mcx16"
            LDFLAGS="-m64 $LDFLAGS"

-           cc_i386='$(CC) -m32'
+           cross_cc_x86_64=$cc
+           cross_cc_cflags_x86_64=$CPU_CFLAGS

            ;;
     x32)
            CPU_CFLAGS="-mx32"
            LDFLAGS="-mx32 $LDFLAGS"
            ;;
     x32)
            CPU_CFLAGS="-mx32"
            LDFLAGS="-mx32 $LDFLAGS"

-           cc_i386='$(CC) -m32'
+           cross_cc_i386=$cc
+           cross_cc_cflags_i386=$CPU_CFLAGS

            ;;
     # No special flags required for other host CPUs
 esac
            ;;
     # No special flags required for other host CPUs
 esac


@@ -1500,6 +1569,8 @@ Advanced options (experts only):
   --extra-cflags=CFLAGS    append extra C compiler flags QEMU_CFLAGS
   --extra-cxxflags=CXXFLAGS append extra C++ compiler flags QEMU_CXXFLAGS
   --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS
   --extra-cflags=CFLAGS    append extra C compiler flags QEMU_CFLAGS
   --extra-cxxflags=CXXFLAGS append extra C++ compiler flags QEMU_CXXFLAGS
   --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS

+  --cross-cc-ARCH=CC       use compiler when building ARCH guest test cases
+  --cross-cc-flags-ARCH=   use compiler flags when building ARCH guest tests

   --make=MAKE              use specified make [$make]
   --install=INSTALL        use specified install [$install]
   --python=PYTHON          use specified python [$python]
   --make=MAKE              use specified make [$make]
   --install=INSTALL        use specified install [$install]
   --python=PYTHON          use specified python [$python]


@@ -1638,6 +1709,7 @@ disabled with --disable-FEATURE, default is enabled if available:
   crypto-afalg    Linux AF_ALG crypto backend driver
   vhost-user      vhost-user support
   capstone        capstone disassembler support
   crypto-afalg    Linux AF_ALG crypto backend driver
   vhost-user      vhost-user support
   capstone        capstone disassembler support

+  debug-mutex     mutex debugging support

 
 NOTE: The object files are built at the place where configure is launched
 EOF
 
 NOTE: The object files are built at the place where configure is launched
 EOF


@@ -1650,8 +1722,8 @@ fi
 
 # Note that if the Python conditional here evaluates True we will exit
 # with status 1 which is a shell 'false' value.
 
 # Note that if the Python conditional here evaluates True we will exit
 # with status 1 which is a shell 'false' value.

-if ! $python -c 'import sys; sys.exit(sys.version_info < (2,6))'; then
-  error_exit "Cannot use '$python', Python 2 >= 2.6 or Python 3 is required." \
+if ! $python -c 'import sys; sys.exit(sys.version_info < (2,7))'; then
+  error_exit "Cannot use '$python', Python 2 >= 2.7 or Python 3 is required." \

       "Use --python=/path/to/python to specify a supported Python."
 fi
 
       "Use --python=/path/to/python to specify a supported Python."
 fi
 


@@ -3386,11 +3458,7 @@ fi
 ##########################################
 # glib support probe
 
 ##########################################
 # glib support probe
 

-if test "$mingw32" = yes; then
-    glib_req_ver=2.30
-else
-    glib_req_ver=2.22
-fi
+glib_req_ver=2.40

 glib_modules=gthread-2.0
 if test "$modules" = yes; then
     glib_modules="$glib_modules gmodule-export-2.0"
 glib_modules=gthread-2.0
 if test "$modules" = yes; then
     glib_modules="$glib_modules gmodule-export-2.0"


@@ -3815,7 +3883,7 @@ libs_softmmu="$libs_softmmu $fdt_libs"
 # opengl probe (for sdl2, gtk, milkymist-tmu2)
 
 if test "$opengl" != "no" ; then
 # opengl probe (for sdl2, gtk, milkymist-tmu2)
 
 if test "$opengl" != "no" ; then

-  opengl_pkgs="epoxy libdrm gbm"
+  opengl_pkgs="epoxy gbm"

   if $pkg_config $opengl_pkgs; then
     opengl_cflags="$($pkg_config --cflags $opengl_pkgs)"
     opengl_libs="$($pkg_config --libs $opengl_pkgs)"
   if $pkg_config $opengl_pkgs; then
     opengl_cflags="$($pkg_config --cflags $opengl_pkgs)"
     opengl_libs="$($pkg_config --libs $opengl_pkgs)"


@@ -4598,6 +4666,7 @@ int main(void) { virgl_renderer_poll(); return 0; }
 EOF
   virgl_cflags=$($pkg_config --cflags virglrenderer 2>/dev/null)
   virgl_libs=$($pkg_config --libs virglrenderer 2>/dev/null)
 EOF
   virgl_cflags=$($pkg_config --cflags virglrenderer 2>/dev/null)
   virgl_libs=$($pkg_config --libs virglrenderer 2>/dev/null)

+  virgl_version=$($pkg_config --modversion virglrenderer 2>/dev/null)

   if $pkg_config virglrenderer >/dev/null 2>&1 && \
      compile_prog "$virgl_cflags" "$virgl_libs" ; then
     virglrenderer="yes"
   if $pkg_config virglrenderer >/dev/null 2>&1 && \
      compile_prog "$virgl_cflags" "$virgl_libs" ; then
     virglrenderer="yes"


@@ -4745,6 +4814,21 @@ if compile_prog "" "" ; then
     sem_timedwait=yes
 fi
 
     sem_timedwait=yes
 fi
 

+##########################################
+# check if we have strchrnul
+
+strchrnul=no
+cat > $TMPC << EOF
+#include <string.h>
+int main(void);
+// Use a haystack that the compiler shouldn't be able to constant fold
+char *haystack = (char*)&main;
+int main(void) { return strchrnul(haystack, 'x') != &haystack[6]; }
+EOF
+if compile_prog "" "" ; then
+    strchrnul=yes
+fi
+

 ##########################################
 # check if trace backend exists
 
 ##########################################
 # check if trace backend exists
 


@@ -5170,6 +5254,20 @@ if test "$fortify_source" != "no"; then
   fi
 fi
 
   fi
 fi
 

+###############################################
+# Check if copy_file_range is provided by glibc
+have_copy_file_range=no
+cat > $TMPC << EOF
+#include <unistd.h>
+int main(void) {
+  copy_file_range(0, NULL, 0, NULL, 0, 0);
+  return 0;
+}
+EOF
+if compile_prog "" "" ; then
+    have_copy_file_range=yes
+fi
+

 ##########################################
 # check if struct fsxattr is available via linux/fs.h
 
 ##########################################
 # check if struct fsxattr is available via linux/fs.h
 


@@ -5436,6 +5534,17 @@ EOF
   fi
 fi
 
   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
+

 ##########################################
 # End of CC checks
 # After here, no more $cc or $ld runs
 ##########################################
 # End of CC checks
 # After here, no more $cc or $ld runs


@@ -5801,7 +5910,7 @@ echo "nettle            $nettle $(echo_version $nettle $nettle_version)"
 echo "nettle kdf        $nettle_kdf"
 echo "libtasn1          $tasn1"
 echo "curses support    $curses"
 echo "nettle kdf        $nettle_kdf"
 echo "libtasn1          $tasn1"
 echo "curses support    $curses"

-echo "virgl support     $virglrenderer"
+echo "virgl support     $virglrenderer $(echo_version $virglrenderer $virgl_version)"

 echo "curl support      $curl"
 echo "mingw32 support   $mingw32"
 echo "Audio drivers     $audio_drv_list"
 echo "curl support      $curl"
 echo "mingw32 support   $mingw32"
 echo "Audio drivers     $audio_drv_list"


@@ -5878,6 +5987,7 @@ echo "seccomp support   $seccomp"
 echo "coroutine backend $coroutine"
 echo "coroutine pool    $coroutine_pool"
 echo "debug stack usage $debug_stack_usage"
 echo "coroutine backend $coroutine"
 echo "coroutine pool    $coroutine_pool"
 echo "debug stack usage $debug_stack_usage"

+echo "mutex debugging   $debug_mutex"

 echo "crypto afalg      $crypto_afalg"
 echo "GlusterFS support $glusterfs"
 echo "gcov              $gcov_tool"
 echo "crypto afalg      $crypto_afalg"
 echo "GlusterFS support $glusterfs"
 echo "gcov              $gcov_tool"


@@ -5899,6 +6009,7 @@ echo "avx2 optimization $avx2_opt"
 echo "replication support $replication"
 echo "VxHS block device $vxhs"
 echo "capstone          $capstone"
 echo "replication support $replication"
 echo "VxHS block device $vxhs"
 echo "capstone          $capstone"

+echo "docker            $docker"

 
 if test "$sdl_too_old" = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
 
 if test "$sdl_too_old" = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"


@@ -6202,6 +6313,9 @@ fi
 if test "$sem_timedwait" = "yes" ; then
   echo "CONFIG_SEM_TIMEDWAIT=y" >> $config_host_mak
 fi
 if test "$sem_timedwait" = "yes" ; then
   echo "CONFIG_SEM_TIMEDWAIT=y" >> $config_host_mak
 fi

+if test "$strchrnul" = "yes" ; then
+  echo "HAVE_STRCHRNUL=y" >> $config_host_mak
+fi

 if test "$byteswap_h" = "yes" ; then
   echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak
 fi
 if test "$byteswap_h" = "yes" ; then
   echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak
 fi


@@ -6273,6 +6387,9 @@ fi
 if test "$have_fsxattr" = "yes" ; then
     echo "HAVE_FSXATTR=y" >> $config_host_mak
 fi
 if test "$have_fsxattr" = "yes" ; then
     echo "HAVE_FSXATTR=y" >> $config_host_mak
 fi

+if test "$have_copy_file_range" = "yes" ; then
+    echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak
+fi

 if test "$vte" = "yes" ; then
   echo "CONFIG_VTE=y" >> $config_host_mak
   echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak
 if test "$vte" = "yes" ; then
   echo "CONFIG_VTE=y" >> $config_host_mak
   echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak


@@ -6627,6 +6744,9 @@ fi
 if test "$capstone" != "no" ; then
   echo "CONFIG_CAPSTONE=y" >> $config_host_mak
 fi
 if test "$capstone" != "no" ; then
   echo "CONFIG_CAPSTONE=y" >> $config_host_mak
 fi

+if test "$debug_mutex" = "yes" ; then
+  echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak
+fi

 
 # Hold two types of flag:
 #   CONFIG_THREAD_SETNAME_BYTHREAD  - we've got a way of setting the name on
 
 # Hold two types of flag:
 #   CONFIG_THREAD_SETNAME_BYTHREAD  - we've got a way of setting the name on


@@ -6671,7 +6791,6 @@ echo "CC=$cc" >> $config_host_mak
 if $iasl -h > /dev/null 2>&1; then
   echo "IASL=$iasl" >> $config_host_mak
 fi
 if $iasl -h > /dev/null 2>&1; then
   echo "IASL=$iasl" >> $config_host_mak
 fi

-echo "CC_I386=$cc_i386" >> $config_host_mak

 echo "HOST_CC=$host_cc" >> $config_host_mak
 echo "CXX=$cxx" >> $config_host_mak
 echo "OBJCC=$objcc" >> $config_host_mak
 echo "HOST_CC=$host_cc" >> $config_host_mak
 echo "CXX=$cxx" >> $config_host_mak
 echo "OBJCC=$objcc" >> $config_host_mak


@@ -6723,6 +6842,10 @@ if test "$gcov" = "yes" ; then
   echo "GCOV=$gcov_tool" >> $config_host_mak
 fi
 
   echo "GCOV=$gcov_tool" >> $config_host_mak
 fi
 

+if test "$docker" != "no"; then
+    echo "HAVE_USER_DOCKER=y" >> $config_host_mak
+fi
+

 # use included Linux headers
 if test "$linux" = "yes" ; then
   mkdir -p linux-headers
 # use included Linux headers
 if test "$linux" = "yes" ; then
   mkdir -p linux-headers


@@ -6786,6 +6909,10 @@ case "$target" in
     ;;
 esac
 
     ;;
 esac
 

+target_compiler=""
+target_compiler_static=""
+target_compiler_cflags=""
+

 mkdir -p $target_dir
 echo "# Automatically generated by configure - do not modify" > $config_target_mak
 
 mkdir -p $target_dir
 echo "# Automatically generated by configure - do not modify" > $config_target_mak
 


@@ -6801,19 +6928,25 @@ TARGET_ABI_DIR=""
 case "$target_name" in
   i386)
     gdb_xml_files="i386-32bit.xml i386-32bit-core.xml i386-32bit-sse.xml"
 case "$target_name" in
   i386)
     gdb_xml_files="i386-32bit.xml i386-32bit-core.xml i386-32bit-sse.xml"

+    target_compiler=$cross_cc_i386
+    target_compiler_cflags=$cross_cc_ccflags_i386

   ;;
   x86_64)
     TARGET_BASE_ARCH=i386
     gdb_xml_files="i386-64bit.xml i386-64bit-core.xml i386-64bit-sse.xml"
   ;;
   x86_64)
     TARGET_BASE_ARCH=i386
     gdb_xml_files="i386-64bit.xml i386-64bit-core.xml i386-64bit-sse.xml"

+    target_compiler=$cross_cc_x86_64

   ;;
   alpha)
     mttcg="yes"
   ;;
   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"
   ;;
   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
   ;;
   aarch64|aarch64_be)
     TARGET_ARCH=aarch64


@@ -6821,59 +6954,75 @@ 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"
     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)
   ;;
   cris)

+    target_compiler=$cross_cc_cris

   ;;
   hppa)
     mttcg="yes"
   ;;
   hppa)
     mttcg="yes"

+    target_compiler=$cross_cc_hppa

   ;;
   lm32)
   ;;
   lm32)

+    target_compiler=$cross_cc_lm32

   ;;
   m68k)
     bflt="yes"
     gdb_xml_files="cf-core.xml cf-fp.xml m68k-fp.xml"
   ;;
   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
   ;;
   microblaze|microblazeel)
     TARGET_ARCH=microblaze
     bflt="yes"
     echo "TARGET_ABI32=y" >> $config_target_mak

+    target_compiler=$cross_cc_microblaze

   ;;
   mips|mipsel)
     TARGET_ARCH=mips
   ;;
   mips|mipsel)
     TARGET_ARCH=mips

+    target_compiler=$cross_cc_mips

     echo "TARGET_ABI_MIPSO32=y" >> $config_target_mak
   ;;
   mipsn32|mipsn32el)
     TARGET_ARCH=mips64
     TARGET_BASE_ARCH=mips
     echo "TARGET_ABI_MIPSO32=y" >> $config_target_mak
   ;;
   mipsn32|mipsn32el)
     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
   ;;
   mips64|mips64el)
     TARGET_ARCH=mips64
     TARGET_BASE_ARCH=mips
     echo "TARGET_ABI_MIPSN32=y" >> $config_target_mak
     echo "TARGET_ABI32=y" >> $config_target_mak
   ;;
   mips64|mips64el)
     TARGET_ARCH=mips64
     TARGET_BASE_ARCH=mips

+    target_compiler=$cross_cc_mips64

     echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak
   ;;
   moxie)
     echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak
   ;;
   moxie)

+    target_compiler=$cross_cc_moxie

   ;;
   nios2)
   ;;
   nios2)

+    target_compiler=$cross_cc_nios2

   ;;
   or1k)
   ;;
   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_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_powerpc

   ;;
   ppcemb)
     TARGET_BASE_ARCH=ppc
     TARGET_ABI_DIR=ppc
     gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
   ;;
   ppcemb)
     TARGET_BASE_ARCH=ppc
     TARGET_ABI_DIR=ppc
     gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"

+    target_compiler=$cross_cc_ppcemb

   ;;
   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"
   ;;
   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

   ;;
   ppc64le)
     TARGET_ARCH=ppc64
   ;;
   ppc64le)
     TARGET_ARCH=ppc64


@@ -6881,6 +7030,7 @@ 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_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
   ;;
   ppc64abi32)
     TARGET_ARCH=ppc64


@@ -6888,45 +7038,57 @@ 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_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
   ;;
   riscv32)
     TARGET_BASE_ARCH=riscv
     TARGET_ABI_DIR=riscv
     mttcg=yes

+    target_compiler=$cross_cc_riscv32

   ;;
   riscv64)
     TARGET_BASE_ARCH=riscv
     TARGET_ABI_DIR=riscv
     mttcg=yes
   ;;
   riscv64)
     TARGET_BASE_ARCH=riscv
     TARGET_ABI_DIR=riscv
     mttcg=yes

+    target_compiler=$cross_cc_riscv64

   ;;
   sh4|sh4eb)
     TARGET_ARCH=sh4
     bflt="yes"
   ;;
   sh4|sh4eb)
     TARGET_ARCH=sh4
     bflt="yes"

+    target_compiler=$cross_cc_sh4

   ;;
   sparc)
   ;;
   sparc)

+    target_compiler=$cross_cc_sparc

   ;;
   sparc64)
     TARGET_BASE_ARCH=sparc
   ;;
   sparc64)
     TARGET_BASE_ARCH=sparc

+    target_compiler=$cross_cc_sparc64

   ;;
   sparc32plus)
     TARGET_ARCH=sparc64
     TARGET_BASE_ARCH=sparc
     TARGET_ABI_DIR=sparc
   ;;
   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"
     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)
   ;;
   tilegx)

+    target_compiler=$cross_cc_tilegx

   ;;
   tricore)
   ;;
   tricore)

+    target_compiler=$cross_cc_tricore

   ;;
   unicore32)
   ;;
   unicore32)

+    target_compiler=$cross_cc_unicore32

   ;;
   xtensa|xtensaeb)
     TARGET_ARCH=xtensa
     mttcg="yes"
   ;;
   xtensa|xtensaeb)
     TARGET_ARCH=xtensa
     mttcg="yes"

+    target_compiler=$cross_cc_xtensa

   ;;
   *)
     error_exit "Unsupported target CPU"
   ;;
   *)
     error_exit "Unsupported target CPU"


@@ -6937,6 +7099,27 @@ if [ "$TARGET_BASE_ARCH" = "" ]; then
   TARGET_BASE_ARCH=$TARGET_ARCH
 fi
 
   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() {
 symlink "$source_path/Makefile.target" "$target_dir/Makefile"
 
 upper() {


@@ -7010,6 +7193,19 @@ if test "$target_bsd_user" = "yes" ; then
   echo "CONFIG_BSD_USER=y" >> $config_target_mak
 fi
 
   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
 
 cflags=""
 # generate QEMU_CFLAGS/LDFLAGS for targets
 
 cflags=""


@@ -7132,6 +7328,11 @@ echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
 
 done # for target in $targets
 
 
 done # for target in $targets
 

+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: subdir-dtc" >> $config_host_mak
 fi
 if [ "$fdt" = "git" ]; then
   echo "config-host.h: subdir-dtc" >> $config_host_mak
 fi


@@ -7205,9 +7406,11 @@ for rom in seabios vgabios ; do
 done
 
 # set up tests data directory
 done
 
 # set up tests data directory

-if [ ! -e tests/data ]; then
-    symlink "$source_path/tests/data" tests/data
-fi
+for tests_subdir in acceptance data; do
+    if [ ! -e tests/$tests_subdir ]; then
+        symlink "$source_path/tests/$tests_subdir" tests/$tests_subdir
+    fi
+done

 
 # set up qemu-iotests in this build directory
 iotests_common_env="tests/qemu-iotests/common.env"
 
 # set up qemu-iotests in this build directory
 iotests_common_env="tests/qemu-iotests/common.env"