From c75e31a1ec593cf7c27ed8acca4fe3e77e2cfc53 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Sat, 24 Oct 2020 23:00:10 -0400
Subject: [PATCH] gdb: use inferior parameter in add_vsyscall_page
Use the new inferior parameter instead of target_gdbarch. There are
still hidden references to the current context behind core_bfd and
exec_bfd, but this seemed better than nothing.
gdb/ChangeLog:
* symfile-mem.c (add_vsyscall_page): Use inferior parameter
instead of target_gdbarch.
Change-Id: Iaf5ace555ee8e46cbef5190aca1f6fe639f06677
---
gdb/ChangeLog | 5 +++++
gdb/symfile-mem.c | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c1a92bb7bd5..2606f871170 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-24 Simon Marchi <simon.marchi@polymtl.ca>
+
+ * symfile-mem.c (add_vsyscall_page): Use inferior parameter
+ instead of target_gdbarch.
+
2020-10-24 Simon Marchi <simon.marchi@polymtl.ca>
* jit.c (jit_reader_load_command): Pass current inferior.
diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index 18ab9357dbb..62c5664879f 100644
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -53,6 +53,7 @@
#include "auxv.h"
#include "elf/common.h"
#include "gdb_bfd.h"
+#include "inferior.h"
/* Verify parameters of target_read_memory_bfd and target_read_memory are
compatible. */
@@ -161,7 +162,7 @@ add_vsyscall_page (inferior *inf)
{
struct mem_range vsyscall_range;
- if (gdbarch_vsyscall_range (target_gdbarch (), &vsyscall_range))
+ if (gdbarch_vsyscall_range (inf->gdbarch, &vsyscall_range))
{
struct bfd *bfd;