Commit a36d64f4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-gdbstub-060520-1' into staging 



Testing and gdbstub updates:

  - travis: drop macosx, tweak ppc64 native
  - cirrus: fix FreeBSD, guard against future breakage
  - gdbstub: support socket debug for linux-user
  - gdbstub: add multiarch tests
  - gdbstub: fixes for m68k

# gpg: Signature made Wed 06 May 2020 09:33:17 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-and-gdbstub-060520-1:
  target/m68k: fix gdb for m68xxx
  tests/tcg: add a multiarch linux-user gdb test
  tests/guest-debug: use the unix socket for linux-user tests
  gdbstub/linux-user: support debugging over a unix socket
  gdbstub: eliminate gdbserver_fd global
  tests/tcg: drop inferior.was_attached() test
  tests/tcg: better trap gdb failures
  gdbstub: Introduce gdb_get_float64() to get 64-bit float registers
  configure: favour gdb-multiarch if we have it
  .travis.yml: reduce the load on [ppc64] GCC check-tcg
  .cirrus.yml: bootstrap pkg unconditionally
  .cirrus.yml: bump FreeBSD to the current stable release
  .travis.yml: drop MacOSX
  .travis.yml: show free disk space at end of run

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ea1329bb a976ed3f

.cirrus.yml

+2 −2
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ env: 


freebsd_12_task:

  freebsd_instance:

    image: freebsd-12-0-release-amd64

    image_family: freebsd-12-1

    cpu: 8

    memory: 8G

  install_script: pkg install -y

  install_script: ASSUME_ALWAYS_YES=yes pkg bootstrap -f ; pkg install -y

    bash bison curl cyrus-sasl git glib gmake gnutls gsed

    nettle perl5 pixman pkgconf png usbredir

  script:

.travis.yml

+3 −28
Original line number Diff line number Diff line
@@ -9,9 +9,8 @@ compiler: 
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 name (currently only linux)

  # - 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
@@ -113,6 +112,7 @@ script: 
        $(exit $BUILD_RC);

    fi

after_script:

  - df -h

  - if command -v ccache ; then ccache --show-stats ; fi
@@ -270,31 +270,6 @@ jobs: 
        - TEST_CMD=""





    # MacOSX builds - cirrus.yml also tests some MacOS builds including latest Xcode



    - name: "OSX Xcode 10.3"

      env:

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

        - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu"

      os: osx

      osx_image: xcode10.3

      compiler: clang

      addons:

        homebrew:

          packages:

            - ccache

            - glib

            - pixman

            - gnu-sed

            - python

          update: true

      before_script:

        - brew link --overwrite python

        - export PATH="/usr/local/opt/ccache/libexec:$PATH"

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

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





    # Python builds

    - name: "GCC Python 3.5 (x86_64-softmmu)"

      env:
@@ -483,7 +458,7 @@ jobs: 
          - genisoimage

      env:

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

        - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},ppc64le-linux-user"

        - CONFIG="--disable-containers --target-list=ppc64-softmmu,ppc64le-linux-user"



    - name: "[s390x] GCC check-tcg"

      arch: s390x

bsd-user/main.c

+4 −4
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ int main(int argc, char **argv) 
    CPUState *cpu;

    int optind;

    const char *r;

    int gdbstub_port = 0;

    const char *gdbstub = NULL;

    char **target_environ, **wrk;

    envlist_t *envlist = NULL;

    char *trace_file = NULL;
@@ -814,7 +814,7 @@ int main(int argc, char **argv) 
                exit(1);

            }

        } else if (!strcmp(r, "g")) {

            gdbstub_port = atoi(argv[optind++]);

            gdbstub = g_strdup(argv[optind++]);

        } else if (!strcmp(r, "r")) {

            qemu_uname_release = argv[optind++];

        } else if (!strcmp(r, "cpu")) {
@@ -1124,8 +1124,8 @@ int main(int argc, char **argv) 
#error unsupported target CPU

#endif



    if (gdbstub_port) {

        gdbserver_start (gdbstub_port);

    if (gdbstub) {

        gdbserver_start(gdbstub);

        gdb_handlesig(cpu, 0);

    }

    cpu_loop(env);

configure

+2 −2
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ libs_qga="" 
debug_info="yes"

stack_protector=""

use_containers="yes"

gdb_bin=$(command -v "gdb")

gdb_bin=$(command -v "gdb-multiarch" || command -v "gdb")



if test -e "$source_path/.git"

then
@@ -7825,7 +7825,7 @@ case "$target_name" in 
  ;;

  m68k)

    bflt="yes"

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

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

    TARGET_SYSTBL_ABI=common

  ;;

  microblaze|microblazeel)

gdb-xml/m68k-core.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!-- Copyright (C) 2008 Free Software Foundation, Inc.



     Copying and distribution of this file, with or without modification,

     are permitted in any medium without royalty provided the copyright

     notice and this notice are preserved.  -->

<!DOCTYPE feature SYSTEM "gdb-target.dtd">

<feature name="org.gnu.gdb.m68k.core">

  <reg name="d0" bitsize="32"/>

  <reg name="d1" bitsize="32"/>

  <reg name="d2" bitsize="32"/>

  <reg name="d3" bitsize="32"/>

  <reg name="d4" bitsize="32"/>

  <reg name="d5" bitsize="32"/>

  <reg name="d6" bitsize="32"/>

  <reg name="d7" bitsize="32"/>

  <reg name="a0" bitsize="32" type="data_ptr"/>

  <reg name="a1" bitsize="32" type="data_ptr"/>

  <reg name="a2" bitsize="32" type="data_ptr"/>

  <reg name="a3" bitsize="32" type="data_ptr"/>

  <reg name="a4" bitsize="32" type="data_ptr"/>

  <reg name="a5" bitsize="32" type="data_ptr"/>

  <reg name="fp" bitsize="32" type="data_ptr"/>

  <reg name="sp" bitsize="32" type="data_ptr"/>



  <reg name="ps" bitsize="32"/>

  <reg name="pc" bitsize="32" type="code_ptr"/>



</feature>