From 80b1849c68dcde61c3e2bf5e6a0cdb61336baea4 Mon Sep 17 00:00:00 2001 From: Aleksandar Ristovski Date: Thu, 11 Jun 2009 19:29:00 +0000 Subject: [PATCH] * i386-nto-tdep.c (i386_nto_target): Remove definition. (init_i386nto_ops): Use macros to set fields to global current_nto_target directly. (i386nto_init_abi): Remove unused nto_set_target call. * nto-tdep.h (nto_set_target): Remove unused declaration. * nto-tdep.c (nto_set_target): Remove unused function. --- gdb/ChangeLog | 9 +++++++++ gdb/i386-nto-tdep.c | 21 ++++++++------------- gdb/nto-tdep.c | 13 ------------- gdb/nto-tdep.h | 2 -- 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 23c2e660f55..7a6c26d5f20 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2009-06-11 Aleksandar Ristovski + + * i386-nto-tdep.c (i386_nto_target): Remove definition. + (init_i386nto_ops): Use macros to set fields to global + current_nto_target directly. + (i386nto_init_abi): Remove unused nto_set_target call. + * nto-tdep.h (nto_set_target): Remove unused declaration. + * nto-tdep.c (nto_set_target): Remove unused function. + 2009-06-11 Pedro Alves * breakpoint.c (break_command_really): Rename local variable diff --git a/gdb/i386-nto-tdep.c b/gdb/i386-nto-tdep.c index 248597f7105..cbe12e3ec27 100644 --- a/gdb/i386-nto-tdep.c +++ b/gdb/i386-nto-tdep.c @@ -34,9 +34,6 @@ #include "solib.h" #include "solib-svr4.h" -/* Target vector for QNX NTO x86. */ -static struct nto_target_ops i386_nto_target; - #ifndef X86_CPU_FXSR #define X86_CPU_FXSR (1L << 12) #endif @@ -310,14 +307,14 @@ i386nto_sigcontext_addr (struct frame_info *this_frame) static void init_i386nto_ops (void) { - i386_nto_target.regset_id = i386nto_regset_id; - i386_nto_target.supply_gregset = i386nto_supply_gregset; - i386_nto_target.supply_fpregset = i386nto_supply_fpregset; - i386_nto_target.supply_altregset = nto_dummy_supply_regset; - i386_nto_target.supply_regset = i386nto_supply_regset; - i386_nto_target.register_area = i386nto_register_area; - i386_nto_target.regset_fill = i386nto_regset_fill; - i386_nto_target.fetch_link_map_offsets = + nto_regset_id = i386nto_regset_id; + nto_supply_gregset = i386nto_supply_gregset; + nto_supply_fpregset = i386nto_supply_fpregset; + nto_supply_altregset = nto_dummy_supply_regset; + nto_supply_regset = i386nto_supply_regset; + nto_register_area = i386nto_register_area; + nto_regset_fill = i386nto_regset_fill; + nto_fetch_link_map_offsets = svr4_ilp32_fetch_link_map_offsets; } @@ -371,8 +368,6 @@ i386nto_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) = nto_in_dynsym_resolve_code; } set_solib_ops (gdbarch, &nto_svr4_so_ops); - - nto_set_target (&i386_nto_target); } /* Provide a prototype to silence -Wmissing-prototypes. */ diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c index e856e14e8e5..b4f1bdeb67f 100644 --- a/gdb/nto-tdep.c +++ b/gdb/nto-tdep.c @@ -67,19 +67,6 @@ nto_target (void) #endif } -void -nto_set_target (struct nto_target_ops *targ) -{ - nto_regset_id = targ->regset_id; - nto_supply_gregset = targ->supply_gregset; - nto_supply_fpregset = targ->supply_fpregset; - nto_supply_altregset = targ->supply_altregset; - nto_supply_regset = targ->supply_regset; - nto_register_area = targ->register_area; - nto_regset_fill = targ->regset_fill; - nto_fetch_link_map_offsets = targ->fetch_link_map_offsets; -} - /* Take a string such as i386, rs6000, etc. and map it onto CPUTYPE_X86, CPUTYPE_PPC, etc. as defined in nto-share/dsmsgs.h. */ int diff --git a/gdb/nto-tdep.h b/gdb/nto-tdep.h index 24e4ff840ca..ef3cce8c482 100644 --- a/gdb/nto-tdep.h +++ b/gdb/nto-tdep.h @@ -142,8 +142,6 @@ typedef struct _debug_regs void nto_init_solib_absolute_prefix (void); -void nto_set_target(struct nto_target_ops *); - char **nto_parse_redirection (char *start_argv[], const char **in, const char **out, const char **err); -- 2.30.2