[RFC] Fix hpux_major_release variable setting

["Pierre Muller" <pierre dot muller at ics-cnrs dot unistra dot fr>]

  As discussed a while ago,
there was an issue when trying to compile
GDB with --enable-targets=all
for mingw64.

  This was linked to the fact that sys/utsname.h
header doesn't exist for mingw64,
but solib-som.c code wrongly calls
uname even if it is not a native hpux system.

  The patch below fixes that problem
by moving the call to uname to hppa-hpux-nat.c

  Is this patch OK?

  I am unsure about the way to move it
to the header... Would it be better to
declare it without external in the header?
  This would then mean that I should also
move DEFAULT_HPUX_MAJOR_RELEASE macro to the header,
but it would have the advantage of allowing
to not use hard-coded 11 in _initialize_hppa_hpux_nat.
  
  Tested on x86_64 linux machine,
no regression found.


Pierre Muller
GDB pascal language maintainer

projecttype:gdb
revision:HEAD
email:muller@ics.u-strasbg.fr
 
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.
	(_initialize_hppa_hpux_nat): Set hpux_major_release variable by
	analyzis of uname call return.

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
@@ -26,13 +26,14 @@
 #include "gdbcore.h"
 #include "target.h"
 #include "inferior.h"
+#include "command.h"
+#include "gdbcmd.h"
 
 #include "hppa-tdep.h"
 #include "solist.h"
 #include "solib.h"
 #include "solib-som.h"
 
-#include <sys/utsname.h>
 #include <string.h>
 
 #undef SOLIB_SOM_DBG 
@@ -131,24 +132,18 @@ som_relocate_section_addresses (struct s
     ;
 }
 
-/* Get HP-UX major release number.  Returns zero if the
-   release is not known.  */
+/* Variable storing HP-UX major release number.
+   On non native system, simply suppose that the major release number is
11.
+   hppa-hpux-nat.c initialization code sets this number to
+   the real one on startup in native conditions.  */
+
+#define DEFAULT_HPUX_MAJOR_RELEASE 11
+int
+hpux_major_release = DEFAULT_HPUX_MAJOR_RELEASE;
 
 static int
 get_hpux_major_release (void)
 {
-  static int hpux_major_release = -1;
-
-  if (hpux_major_release == -1)
-    {
-      struct utsname x;
-      char *p;
-
-      uname (&x);
-      p = strchr (x.release, '.');
-      hpux_major_release = p ? atoi (p + 1) : 0;
-    }
-
   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"
 
@@ -242,7 +244,12 @@ void
 _initialize_hppa_hpux_nat (void)
 {
   struct target_ops *t;
+  struct utsname x;
+  char *p;
 
+  uname (&x);
+  p = strchr (x.release, '.');
+  hpux_major_release = p ? atoi (p + 1) : 11;
 #ifdef HAVE_TTRACE
   t = inf_ttrace_target ();
 #else