Merge branch 'master' into merge-job

diff --combined gdb/Makefile.in
index 70bf3e4cea05044c2bed23759563a32af959b229,0bc8142d2a039a15e5d71b2bfbaf79a54fc045e2..084c83dcef7ef25458f7a71796e0c2cef6bc22df
--- 1/gdb/Makefile.in
--- 2/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@@ -1,5 -1,4 +1,5 @@@
  # Copyright (C) 1989-2020 Free Software Foundation, Inc.
 +# Copyright (C) 2019-2020 Advanced Micro Devices, Inc. All rights reserved.
  
  # This file is part of GDB.
  
@@@ -610,7 -609,7 +610,7 @@@ INTERNAL_LDFLAGS = 
  CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(LIBCTF) $(ZLIB) \
          $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \
        $(XM_CLIBS) $(GDBTKLIBS) \
 -      @LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \
 +      @LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ @ROCM_DBGAPI_LIBS@ \
        $(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \
        $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) $(LIBICONV) $(LIBMPFR) \
        $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS)
@@@ -987,6 -986,7 +987,7 @@@ COMMON_SFILES = 
        gdbsupport/gdb-dlfcn.c \
        gdbsupport/gdb_tilde_expand.c \
        gdbsupport/gdb_vecs.c \
+       gdbsupport/gdb_wait.c \
        gdbsupport/netstuff.c \
        gdbsupport/new-op.c \
        gdbsupport/pathstuff.c \
@@@ -1219,7 -1219,6 +1220,7 @@@ HFILES_NO_SRCDIR = 
        amd64-linux-tdep.h \
        amd64-nat.h \
        amd64-tdep.h \
 +      amdgcn-rocm-tdep.h \
        annotate.h \
        arc-tdep.h \
        arch-utils.h \
@@@ -1385,7 -1384,6 +1386,7 @@@
        riscv-fbsd-tdep.h \
        riscv-ravenscar-thread.h \
        riscv-tdep.h \
 +      rocm-tdep.h \
        rs6000-aix-tdep.h \
        rs6000-tdep.h \
        run-on-main-thread.h \
@@@ -2187,7 -2185,6 +2188,7 @@@ ALLDEPFILES = 
        amd64-obsd-tdep.c \
        amd64-sol2-tdep.c \
        amd64-tdep.c \
 +      amdgcn-rocm-tdep.c \
        arc-tdep.c \
        arm.c \
        arm-bsd-tdep.c \
@@@ -2307,7 -2304,6 +2308,7 @@@
        riscv-linux-tdep.c \
        riscv-ravenscar-thread.c \
        riscv-tdep.c \
 +      rocm-tdep.c \
        rl78-tdep.c \
        rs6000-lynx178-tdep.c \
        rs6000-nat.c \
@@@ -2327,7 -2323,6 +2328,7 @@@
        sh-tdep.c \
        sol2-tdep.c \
        solib-aix.c \
 +      solib-rocm.c \
        solib-svr4.c \
        sparc-linux-nat.c \
        sparc-linux-tdep.c \

diff --combined gdb/cli/cli-cmds.c
index 6c678250c7a9240aef0bd5a8f0f1fcbdfdd34b0a,c2ba3a4238ab64a0a2fa9a2ffb158f12237d50a8..e1204f74ef1aea3840f4c94007cdcaa158551fb8
--- 1/gdb/cli/cli-cmds.c
--- 2/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@@ -1,7 -1,6 +1,7 @@@
  /* GDB CLI commands.
  
     Copyright (C) 2000-2020 Free Software Foundation, Inc.
 +   Copyright (C) 2019-2020 Advanced Micro Devices, Inc. All rights reserved.
  
     This file is part of GDB.
  
@@@ -801,6 -800,18 +801,18 @@@ exit_status_set_internal_vars (int exit
    clear_internalvar (var_signal);
    if (WIFEXITED (exit_status))
      set_internalvar_integer (var_code, WEXITSTATUS (exit_status));
+ #ifdef __MINGW32__
+   else if (WIFSIGNALED (exit_status) && WTERMSIG (exit_status) == -1)
+     {
+       /* The -1 condition can happen on MinGW, if we don't recognize
+        the fatal exception code encoded in the exit status; see
+        gdbsupport/gdb_wait.c.  We don't want to lose information in
+        the exit status in that case.  Record it as a normal exit
+        with the full exit status, including the higher 0xC0000000
+        bits.  */
+       set_internalvar_integer (var_code, exit_status);
+     }
+ #endif
    else if (WIFSIGNALED (exit_status))
      set_internalvar_integer (var_signal, WTERMSIG (exit_status));
    else
@@@ -1430,7 -1441,6 +1442,7 @@@ static voi
  disassemble_command (const char *arg, int from_tty)
  {
    struct gdbarch *gdbarch = get_current_arch ();
 +  struct obj_section *section;
    CORE_ADDR low, high;
    const char *name;
    CORE_ADDR pc;
@@@ -1482,14 -1492,6 +1494,14 @@@
      }
  
    pc = value_as_address (parse_to_comma_and_eval (&p));
 +
 +  /* ROCM: get the gdbarch from the objfile, if found */
 +  section = find_pc_overlay (pc);
 +  if (section == NULL)
 +    section = find_pc_section (pc);
 +  if (section != NULL)
 +    gdbarch = get_objfile_arch (section->objfile);
 +
    if (p[0] == ',')
      ++p;
    if (p[0] == '\0')