From: Guinevere Larsen <guinevere@redhat.com>
Date: Wed, 23 Apr 2025 14:12:07 +0000 (-0300)
Subject: gdb: fix building with all targets
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65ab41b7d5c612b6000b28f4c50bb256b2a9e22b;p=thirdparty%2Fbinutils-gdb.git

gdb: fix building with all targets

Commit b9c7eed0c2409fc640129a38d80a2bf1212b464a recently introduced
a build failure, because the file gdb/riscv-canonicalize-syscall-gen.c
hasn't been added to the ALL_64_TARGET_OBS variable in the makefile,
leading to a linker issue.  This commit fixes that.

Also, turns out, the new file was slightly outdated, as the gdb_old_mmap
syscall has been renamed to gdb_sys_old_mmap in commit
432eca4113d5748ad284a068873455f9962b44fe.  This commit also fixes that
on the generated file itself, to quickly fix the build. A followup
commit will fix the python file responsible for generating the .c file.
---

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 9275f8dd1a2..68b5e56c8da 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -769,6 +769,7 @@ ALL_64_TARGET_OBS = \
 	mips-sde-tdep.o \
 	mips-tdep.o \
 	mips64-obsd-tdep.o \
+	riscv-canonicalize-syscall-gen.o \
 	riscv-fbsd-tdep.o \
 	riscv-linux-tdep.o \
 	riscv-none-tdep.o \
diff --git a/gdb/riscv-canonicalize-syscall-gen.c b/gdb/riscv-canonicalize-syscall-gen.c
index 3749fc32f33..5252c7492b2 100644
--- a/gdb/riscv-canonicalize-syscall-gen.c
+++ b/gdb/riscv-canonicalize-syscall-gen.c
@@ -250,7 +250,7 @@ riscv64_canonicalize_syscall (int syscall)
     case 219: return gdb_sys_keyctl;
     case 220: return gdb_sys_clone;
     case 221: return gdb_sys_execve;
-    case 222: return gdb_old_mmap;
+    case 222: return gdb_sys_old_mmap;
     case 223: return gdb_sys_fadvise64;
     case 224: return gdb_sys_swapon;
     case 225: return gdb_sys_swapoff;