From 5436ff0304a28eaf84b2a3029b4005e55d93683a Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 17 Dec 2013 21:49:18 -0700
Subject: [PATCH] Add target_ops argument to to_augmented_libraries_svr4_read
2014-02-19 Tom Tromey <tromey@redhat.com>
* target.h (struct target_ops) <to_augmented_libraries_svr4_read>:
Add argument.
(target_augmented_libraries_svr4_read): Add argument.
* target.c (update_current_target): Update.
* remote.c (remote_augmented_libraries_svr4_read): Add 'self'
argument.
---
gdb/ChangeLog | 9 +++++++++
gdb/remote.c | 2 +-
gdb/target.c | 2 +-
gdb/target.h | 4 ++--
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c606930a563..5842158c4e3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-19 Tom Tromey <tromey@redhat.com>
+
+ * target.h (struct target_ops) <to_augmented_libraries_svr4_read>:
+ Add argument.
+ (target_augmented_libraries_svr4_read): Add argument.
+ * target.c (update_current_target): Update.
+ * remote.c (remote_augmented_libraries_svr4_read): Add 'self'
+ argument.
+
2014-02-19 Tom Tromey <tromey@redhat.com>
* target.h (struct target_ops) <to_call_history_range>: Add
diff --git a/gdb/remote.c b/gdb/remote.c
index eb8eb0f5b2f..2f079ca117a 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -11370,7 +11370,7 @@ remote_read_btrace (struct target_ops *self,
}
static int
-remote_augmented_libraries_svr4_read (void)
+remote_augmented_libraries_svr4_read (struct target_ops *self)
{
struct remote_state *rs = get_remote_state ();
diff --git a/gdb/target.c b/gdb/target.c
index d3f9fb83549..44ffe4762cf 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -947,7 +947,7 @@ update_current_target (void)
(int (*) (struct target_ops *))
return_zero);
de_fault (to_augmented_libraries_svr4_read,
- (int (*) (void))
+ (int (*) (struct target_ops *))
return_zero);
de_fault (to_execution_direction, default_execution_direction);
diff --git a/gdb/target.h b/gdb/target.h
index 69fd0b90090..40e7688b618 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -987,7 +987,7 @@ struct target_ops
/* Nonzero if TARGET_OBJECT_LIBRARIES_SVR4 may be read with a
non-empty annex. */
- int (*to_augmented_libraries_svr4_read) (void);
+ int (*to_augmented_libraries_svr4_read) (struct target_ops *);
/* Those unwinders are tried before any other arch unwinders. Use NULL if
it is not used. */
@@ -1893,7 +1893,7 @@ extern char *target_fileio_read_stralloc (const char *filename);
(*current_target.to_can_use_agent) (¤t_target)
#define target_augmented_libraries_svr4_read() \
- (*current_target.to_augmented_libraries_svr4_read) ()
+ (*current_target.to_augmented_libraries_svr4_read) (¤t_target)
/* Command logging facility. */