This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[patch] nto target: code cleanup #2
- From: Aleksandar Ristovski <aristovski at qnx dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Thu, 11 Jun 2009 15:50:59 -0400
- Subject: [patch] nto target: code cleanup #2
Hello,
Similar to the previous patch, removing unnecessary
indirections.
Thanks,
--
Aleksandar Ristovski
QNX Software Systems
ChangeLog:
* i386-nto-tdep.c (i386nto_init_abi): Remove nto_svr4_so_ops.
Initialize solib ops direcly and set them.
Index: gdb/i386-nto-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-nto-tdep.c,v
retrieving revision 1.34
diff -u -p -r1.34 i386-nto-tdep.c
--- gdb/i386-nto-tdep.c 11 Jun 2009 19:29:00 -0000 1.34
+++ gdb/i386-nto-tdep.c 11 Jun 2009 19:49:53 -0000
@@ -322,7 +322,6 @@ static void
i386nto_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
- static struct target_so_ops nto_svr4_so_ops;
/* Deal with our strange signals. */
nto_initialize_signals ();
@@ -349,25 +348,16 @@ i386nto_init_abi (struct gdbarch_info in
set_solib_svr4_fetch_link_map_offsets
(gdbarch, svr4_ilp32_fetch_link_map_offsets);
- /* Initialize this lazily, to avoid an initialization order
- dependency on solib-svr4.c's _initialize routine. */
- if (nto_svr4_so_ops.in_dynsym_resolve_code == NULL)
- {
- nto_svr4_so_ops = svr4_so_ops;
-
- /* Our loader handles solib relocations differently than svr4. */
- nto_svr4_so_ops.relocate_section_addresses
- = nto_relocate_section_addresses;
-
- /* Supply a nice function to find our solibs. */
- nto_svr4_so_ops.find_and_open_solib
- = nto_find_and_open_solib;
-
- /* Our linker code is in libc. */
- nto_svr4_so_ops.in_dynsym_resolve_code
- = nto_in_dynsym_resolve_code;
- }
- set_solib_ops (gdbarch, &nto_svr4_so_ops);
+ /* Our loader handles solib relocations differently than svr4. */
+ svr4_so_ops.relocate_section_addresses = nto_relocate_section_addresses;
+
+ /* Supply a nice function to find our solibs. */
+ svr4_so_ops.find_and_open_solib = nto_find_and_open_solib;
+
+ /* Our linker code is in libc. */
+ svr4_so_ops.in_dynsym_resolve_code = nto_in_dynsym_resolve_code;
+
+ set_solib_ops (gdbarch, &svr4_so_ops);
}
/* Provide a prototype to silence -Wmissing-prototypes. */