Merge branch 'master' into merge-job

diff --cc gdb/Makefile.in
index 3327d5a1f6c7b786a0cdf2717435320b634ae123,fa5c820b918e892cc1f9a190a73f4ebc979c03b3..e6e9d3f2c6b876ca20ea23a35f3254ae13f52336
--- 1/gdb/Makefile.in
--- 2/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@@ -1382,8 -1381,8 +1383,9 @@@ HFILES_NO_SRCDIR = 
        remote-fileio.h \
        remote-notif.h \
        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 \
@@@ -2303,8 -2301,8 +2305,9 @@@ ALLDEPFILES = 
        riscv-fbsd-tdep.c \
        riscv-linux-nat.c \
        riscv-linux-tdep.c \
+       riscv-ravenscar-thread.c \
        riscv-tdep.c \
 +      rocm-tdep.c \
        rl78-tdep.c \
        rs6000-lynx178-tdep.c \
        rs6000-nat.c \

diff --cc gdb/configure.tgt
Simple merge