From 1408c251017cb8f0ffe27cbc69ffbed385d408da Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 7 May 2010 14:00:30 +0000 Subject: [PATCH] * gdbarch.sh (qsupported): Delete. * gdbarch.h, gdbarch.c: Regenerate. * remote.c (remote_query_supported): Remove use of gdbarch_qsupported. --- gdb/ChangeLog | 7 +++++++ gdb/gdbarch.c | 23 ----------------------- gdb/gdbarch.h | 5 ----- gdb/gdbarch.sh | 3 --- gdb/remote.c | 4 ---- 5 files changed, 7 insertions(+), 35 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e37a1de778..89dba909e4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2010-05-07 Pedro Alves + + * gdbarch.sh (qsupported): Delete. + * gdbarch.h, gdbarch.c: Regenerate. + * remote.c (remote_query_supported): Remove use of + gdbarch_qsupported. + 2010-05-06 Sergio Durigan Junior * xml-syscall.c (syscall_start_syscalls_info): Remove unused diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 3b6f614ca6..ea35fa3a4c 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -260,7 +260,6 @@ struct gdbarch int has_global_breakpoints; gdbarch_has_shared_address_space_ftype *has_shared_address_space; gdbarch_fast_tracepoint_valid_at_ftype *fast_tracepoint_valid_at; - const char * qsupported; gdbarch_auto_charset_ftype *auto_charset; gdbarch_auto_wide_charset_ftype *auto_wide_charset; const char * solib_symbols_extension; @@ -408,7 +407,6 @@ struct gdbarch startup_gdbarch = 0, /* has_global_breakpoints */ default_has_shared_address_space, /* has_shared_address_space */ default_fast_tracepoint_valid_at, /* fast_tracepoint_valid_at */ - 0, /* qsupported */ default_auto_charset, /* auto_charset */ default_auto_wide_charset, /* auto_wide_charset */ 0, /* solib_symbols_extension */ @@ -681,7 +679,6 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of has_global_breakpoints, invalid_p == 0 */ /* Skip verify of has_shared_address_space, invalid_p == 0 */ /* Skip verify of fast_tracepoint_valid_at, invalid_p == 0 */ - /* Skip verify of qsupported, invalid_p == 0 */ /* Skip verify of auto_charset, invalid_p == 0 */ /* Skip verify of auto_wide_charset, invalid_p == 0 */ /* Skip verify of has_dos_based_file_system, invalid_p == 0 */ @@ -1067,9 +1064,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: push_dummy_code = <%s>\n", host_address_to_string (gdbarch->push_dummy_code)); - fprintf_unfiltered (file, - "gdbarch_dump: qsupported = %s\n", - gdbarch->qsupported); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_read_pc_p() = %d\n", gdbarch_read_pc_p (gdbarch)); @@ -3615,23 +3609,6 @@ set_gdbarch_fast_tracepoint_valid_at (struct gdbarch *gdbarch, gdbarch->fast_tracepoint_valid_at = fast_tracepoint_valid_at; } -const char * -gdbarch_qsupported (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - /* Skip verify of qsupported, invalid_p == 0 */ - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_qsupported called\n"); - return gdbarch->qsupported; -} - -void -set_gdbarch_qsupported (struct gdbarch *gdbarch, - const char * qsupported) -{ - gdbarch->qsupported = qsupported; -} - const char * gdbarch_auto_charset (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 71da45be48..af060df880 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -923,11 +923,6 @@ typedef int (gdbarch_fast_tracepoint_valid_at_ftype) (struct gdbarch *gdbarch, C extern int gdbarch_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr, int *isize, char **msg); extern void set_gdbarch_fast_tracepoint_valid_at (struct gdbarch *gdbarch, gdbarch_fast_tracepoint_valid_at_ftype *fast_tracepoint_valid_at); -/* Not NULL if a target has additonal field for qSupported. */ - -extern const char * gdbarch_qsupported (struct gdbarch *gdbarch); -extern void set_gdbarch_qsupported (struct gdbarch *gdbarch, const char * qsupported); - /* Return the "auto" target charset. */ typedef const char * (gdbarch_auto_charset_ftype) (void); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 81c5dc2365..f680f180f7 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -767,9 +767,6 @@ m:int:has_shared_address_space:void:::default_has_shared_address_space::0 # True if a fast tracepoint can be set at an address. m:int:fast_tracepoint_valid_at:CORE_ADDR addr, int *isize, char **msg:addr, isize, msg::default_fast_tracepoint_valid_at::0 -# Not NULL if a target has additonal field for qSupported. -v:const char *:qsupported:::0:0::0:gdbarch->qsupported - # Return the "auto" target charset. f:const char *:auto_charset:void::default_auto_charset:default_auto_charset::0 # Return the "auto" target wide charset. diff --git a/gdb/remote.c b/gdb/remote.c index 95bbc3fb05..3da591f87b 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -3562,13 +3562,9 @@ remote_query_supported (void) if (remote_protocol_packets[PACKET_qSupported].support != PACKET_DISABLE) { char *q = NULL; - const char *qsupported = gdbarch_qsupported (target_gdbarch); if (rs->extended) q = remote_query_supported_append (q, "multiprocess+"); - - if (qsupported) - q = remote_query_supported_append (q, qsupported); if (remote_support_xml) q = remote_query_supported_append (q, remote_support_xml);