aboutsummaryrefslogtreecommitdiff
path: root/gdb/solib-pa64.c
diff options
context:
space:
mode:
authorUlrich Weigand <uweigand@de.ibm.com>2007-10-24 21:14:17 +0000
committerUlrich Weigand <uweigand@de.ibm.com>2007-10-24 21:14:17 +0000
commitd542061a791651ada2064bcc23f62ec142acc628 (patch)
tree2a2dfa13e450a5ac8464bdfdb0999d5bb315c4d5 /gdb/solib-pa64.c
parent917630e4a052582e310992c23cdf912b39687d42 (diff)
downloadgdb-d542061a791651ada2064bcc23f62ec142acc628.zip
gdb-d542061a791651ada2064bcc23f62ec142acc628.tar.gz
gdb-d542061a791651ada2064bcc23f62ec142acc628.tar.bz2
* configure.tgt: Remove hppa*64*-*-hpux11* special case.
* config/pa/hppa64.mt: Delete file. * config/pa/hppahpux.mt (MT_CFLAGS): Remove. (TDEPFILES): Move somread.o to ... * config/pa/hpux.mh (NATDEPFILES): ... here. * configure.ac: Add check for elf_hp.h header. Search libdl and libxpdl for dlgetmodinfo. * config.in, configure: Regenerate. * solib-pa64.c: Conditionalize compilation on #ifdef HAVE_ELF_HP_H instead of #ifndef PA_SOM_ONLY. Include "solib.h". (pa64_solib_select): Take gdbarch instead of tdep argument. Call set_solib_ops instead of modifying current_target_so_ops. * solib-pa64.h (pa64_solib_select): Update prototype. * solib-som.c: Remove include of "som.h". Include "solib.h". (som_solib_select): Take gdbarch instead of tdep argument. Call set_solib_ops instead of modifying current_target_so_ops. * solib-som.h (som_solib_select): Update prototype. * hppa-hpux-tdep.c (hppa_hpux_som_init_abi): Pass gdbarch instead of tdep to som_solib_select call. (hppa_hpux_elf_init_abi): Pass gdbarch instead of tdep to pa64_solib_select call. * Makefile.in: Update dependencies.
Diffstat (limited to 'gdb/solib-pa64.c')
-rw-r--r--gdb/solib-pa64.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/gdb/solib-pa64.c b/gdb/solib-pa64.c
index 599f3f3..97a105d 100644
--- a/gdb/solib-pa64.c
+++ b/gdb/solib-pa64.c
@@ -39,12 +39,14 @@
#include "hppa-tdep.h"
#include "solist.h"
+#include "solib.h"
#include "solib-pa64.h"
#undef SOLIB_PA64_DBG
-/* If we are building for a SOM-only target, then we don't need this. */
-#ifndef PA_SOM_ONLY
+/* We can build this file only when running natively on 64-bit HP/UX.
+ We check for that by checking for the elf_hp.h header file. */
+#ifdef HAVE_ELF_HP_H
/* FIXME: kettenis/20041213: These includes should be eliminated. */
#include <dlfcn.h>
@@ -657,9 +659,10 @@ _initialize_pa64_solib (void)
memset (&dld_cache, 0, sizeof (dld_cache));
}
-void pa64_solib_select (struct gdbarch_tdep *tdep)
+void pa64_solib_select (struct gdbarch *gdbarch)
{
- current_target_so_ops = &pa64_so_ops;
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+ set_solib_ops (gdbarch, &pa64_so_ops);
tdep->solib_thread_start_addr = pa64_solib_thread_start_addr;
tdep->solib_get_got_by_pc = pa64_solib_get_got_by_pc;
@@ -667,7 +670,7 @@ void pa64_solib_select (struct gdbarch_tdep *tdep)
tdep->solib_get_text_base = pa64_solib_get_text_base;
}
-#else /* PA_SOM_ONLY */
+#else /* HAVE_ELF_HP_H */
extern initialize_file_ftype _initialize_pa64_solib; /* -Wmissing-prototypes */
@@ -676,7 +679,7 @@ _initialize_pa64_solib (void)
{
}
-void pa64_solib_select (struct gdbarch_tdep *tdep)
+void pa64_solib_select (struct gdbarch *gdbarch)
{
/* For a SOM-only target, there is no pa64 solib support. This is needed
for hppa-hpux-tdep.c to build. */