This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFC-v2] Fix hpux_major_release variable setting
- From: "Pierre Muller" <pierre dot muller at ics-cnrs dot unistra dot fr>
- To: "'Joel Brobecker'" <brobecker at adacore dot com>
- Cc: <gdb-patches at sourceware dot org>
- Date: Fri, 14 Jan 2011 17:54:19 +0100
- Subject: [RFC-v2] Fix hpux_major_release variable setting
- References: <000f01cbb401$1093cdc0$31bb6940$@muller@ics-cnrs.unistra.fr> <20110114163035.GQ2504@adacore.com>
Thanks for your comments,
I hope the patch below
addresses all comments/suggestions
that you made.
Concerning the description of the variable,
I just removed 'in native conditions.'
as you added 'On native systems, '
at the start of the sentence.
2011-01-14 Pierre Muller <muller@ics.u-strasbg.fr>
* solib-som.h (hpux_major_release): Declare variable here.
* solib-som.c: Remove <sys/utsname.h> header.
(DEFAULT_HPUX_MAJOR_RELEASE): New macro.
(hpux_major_release): Make global, change default value to
DEFAULT_HPUX_MAJOR_RELEASE.
(get_hpux_major_release): Simply return HPUX_MAJOR_RELEASE.
* hppa-hpux-nat.c: Add <sys/utsname.h> include.
Add "solib-som.h" header.
(set_hpux_major_release): New function.
(_initialize_hppa_hpux_nat): Call set_hpux_major_release.
Index: src/gdb/solib-som.h
===================================================================
RCS file: /cvs/src/src/gdb/solib-som.h,v
retrieving revision 1.9
diff -u -p -r1.9 solib-som.h
--- src/gdb/solib-som.h 1 Jan 2011 15:33:15 -0000 1.9
+++ src/gdb/solib-som.h 14 Jan 2011 15:18:22 -0000
@@ -25,6 +25,8 @@ struct objfile;
struct section_offsets;
struct gdbarch;
+extern int hpux_major_release;
+
void som_solib_select (struct gdbarch *gdbarch);
int som_solib_section_offsets (struct objfile *objfile,
Index: src/gdb/solib-som.c
===================================================================
RCS file: /cvs/src/src/gdb/solib-som.c,v
retrieving revision 1.34
diff -u -p -r1.34 solib-som.c
--- src/gdb/solib-som.c 11 Jan 2011 21:53:24 -0000 1.34
+++ src/gdb/solib-som.c 14 Jan 2011 15:18:22 -0000
@@ -32,7 +32,6 @@
#include "solib.h"
#include "solib-som.h"
-#include <sys/utsname.h>
#include <string.h>
#undef SOLIB_SOM_DBG
@@ -131,24 +130,23 @@ som_relocate_section_addresses (struct s
;
}
-/* Get HP-UX major release number. Returns zero if the
- release is not known. */
-static int
-get_hpux_major_release (void)
-{
- static int hpux_major_release = -1;
+/* Variable storing HP-UX major release number.
- if (hpux_major_release == -1)
- {
- struct utsname x;
- char *p;
+ On non-native system, simply assume that the major release number
+ is 11. On native systems, hppa-hpux-nat.c initialization code
+ sets this number to the real one on startup.
+
+ We cannot compute this value here, because we need to make a native
+ call to "uname". We are are not allowed to do that from here, as
+ this file is used for both native and cross debugging. */
- uname (&x);
- p = strchr (x.release, '.');
- hpux_major_release = p ? atoi (p + 1) : 0;
- }
+#define DEFAULT_HPUX_MAJOR_RELEASE 11
+int hpux_major_release = DEFAULT_HPUX_MAJOR_RELEASE;
+static int
+get_hpux_major_release (void)
+{
return hpux_major_release;
}
Index: src/gdb/hppa-hpux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/hppa-hpux-nat.c,v
retrieving revision 1.22
diff -u -p -r1.22 hppa-hpux-nat.c
--- src/gdb/hppa-hpux-nat.c 14 Jan 2011 13:38:24 -0000 1.22
+++ src/gdb/hppa-hpux-nat.c 14 Jan 2011 15:18:22 -0000
@@ -25,6 +25,7 @@
#include "gdb_assert.h"
#include <sys/ptrace.h>
+#include <sys/utsname.h>
#include <machine/save_state.h>
#ifdef HAVE_TTRACE
@@ -32,6 +33,7 @@
#endif
#include "hppa-tdep.h"
+#include "solib-som.h"
#include "inf-ptrace.h"
#include "inf-ttrace.h"
@@ -233,6 +235,21 @@ hppa_hpux_store_inferior_registers (stru
hppa_hpux_store_register (regcache, regnum);
}
+/* Set hpux_major_release variable to the value retrieved from a call to
+ uname function. */
+
+static void
+set_hpux_major_release ()
+{
+ struct utsname x;
+ char *p;
+
+ uname (&x);
+ p = strchr (x.release, '.');
+ if (p)
+ hpux_major_release = atoi (p + 1);
+}
+
/* Prevent warning from -Wmissing-prototypes. */
@@ -243,6 +260,8 @@ _initialize_hppa_hpux_nat (void)
{
struct target_ops *t;
+ set_hpux_major_release ();
+
#ifdef HAVE_TTRACE
t = inf_ttrace_target ();
#else