gdb: fix riscv record-full push

When I (Guinevere) pushed commit
b9c7eed0c2409fc640129a38d80a2bf1212b464a I accidentally used an outdated
version of the patch. This current patch fixes the importation of that
patch based on the actually approved version instead.

diff --git a/gdb/riscv-canonicalize-syscall-gen.c b/gdb/riscv-canonicalize-syscall-gen.c
index 5252c7492b2c8c4a5b8281a6629e79c55652eb8c..67e5410dc6d1f975ec389aad3b124a92c80f6537 100644 (file)
--- a/gdb/riscv-canonicalize-syscall-gen.c
+++ b/gdb/riscv-canonicalize-syscall-gen.c
@@ -270,7 +270,7 @@ riscv64_canonicalize_syscall (int syscall)
     case 239: return gdb_sys_move_pages;
     /* case 240: return gdb_sys_rt_tgsigqueueinfo;  */
     /* case 241: return gdb_sys_perf_event_open;  */
-    /* case 242: return gdb_sys_accept4;  */
+    case 242: return gdb_sys_accept4;
     /* case 243: return gdb_sys_recvmmsg;  */
     /* case 258: return gdb_sys_riscv_hwprobe;  */
     /* case 259: return gdb_sys_riscv_flush_icache;  */
@@ -336,6 +336,22 @@ riscv64_canonicalize_syscall (int syscall)
     /* case 448: return gdb_sys_process_mrelease;  */
     /* case 449: return gdb_sys_futex_waitv;  */
     /* case 450: return gdb_sys_set_mempolicy_home_node;  */
+    /* case 451: return gdb_sys_cachestat;  */
+    /* case 452: return gdb_sys_fchmodat2;  */
+    /* case 453: return gdb_sys_map_shadow_stack;  */
+    /* case 454: return gdb_sys_futex_wake;  */
+    /* case 455: return gdb_sys_futex_wait;  */
+    /* case 456: return gdb_sys_futex_requeue;  */
+    /* case 457: return gdb_sys_statmount;  */
+    /* case 458: return gdb_sys_listmount;  */
+    /* case 459: return gdb_sys_lsm_get_self_attr;  */
+    /* case 460: return gdb_sys_lsm_set_self_attr;  */
+    /* case 461: return gdb_sys_lsm_list_modules;  */
+    /* case 462: return gdb_sys_mseal;  */
+    /* case 463: return gdb_sys_setxattrat;  */
+    /* case 464: return gdb_sys_getxattrat;  */
+    /* case 465: return gdb_sys_listxattrat;  */
+    /* case 466: return gdb_sys_removexattrat;  */
     default:
       return gdb_sys_no_syscall;
     }

diff --git a/gdb/riscv-linux-tdep.h b/gdb/riscv-linux-tdep.h
index 0f481b168d1882e45e739b46b9965e85773176fc..9dd9e373caabb812b3cb65b05bc9945a287d6cb2 100644 (file)
--- a/gdb/riscv-linux-tdep.h
+++ b/gdb/riscv-linux-tdep.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef RISCV_LINUX_TDEP_H
-#define RISCV_LINUX_TDEP_H
+#ifndef GDB_RISCV_LINUX_TDEP_H
+#define GDB_RISCV_LINUX_TDEP_H
 
 #include "linux-record.h"
 
@@ -26,4 +26,4 @@
 
 extern enum gdb_syscall riscv64_canonicalize_syscall (int syscall);
 
-#endif /* RISCV_LINUX_TDEP_H */
+#endif /* GDB_RISCV_LINUX_TDEP_H */

diff --git a/gdb/syscalls/riscv-canonicalize-syscall-gen.py b/gdb/syscalls/riscv-canonicalize-syscall-gen.py
index aa07ac13145b176074a4fcee1332a12ab664fe16..30e52b7e4727cdf3d549b22301a7ffb2d521c750 100755 (executable)
--- a/gdb/syscalls/riscv-canonicalize-syscall-gen.py
+++ b/gdb/syscalls/riscv-canonicalize-syscall-gen.py
@@ -32,7 +32,7 @@
 # options:
 #   -h, --help            show this help message and exit
 #   -i INPUT, --input INPUT
-#                         path to riscv linux syscalls (riscv-glibc/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h)
+#                         path to riscv linux syscalls (glibc/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h)
 
 import argparse
 import re
@@ -142,7 +142,7 @@ def setup_parser() -> argparse.ArgumentParser:
                "--input",
                type=_Path,
                required=True,
-               help="path to riscv linux syscalls (riscv-glibc/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h)",
+               help="path to riscv linux syscalls (glibc/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h)",
        )
        return parser