This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: one week to gdb-7.6 release?


> Date: Wed, 20 Mar 2013 19:13:16 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: gdb-patches@sourceware.org, palves@redhat.com, jan.kratochvil@redhat.com, ralf.corsepius@rtems.org, vapier@gentoo.org, joel.sherrill@oarcorp.com
> 
> > Date: Wed, 20 Mar 2013 09:00:32 -0700
> > From: Joel Brobecker <brobecker@adacore.com>
> > Cc: Pedro Alves <palves@redhat.com>,	Jan Kratochvil <jan.kratochvil@redhat.com>,	Ralf Corsepius <ralf.corsepius@rtems.org>,	Mike Frysinger <vapier@gentoo.org>,	Joel Sherrill <joel.sherrill@oarcorp.com>
> > 
> > We're about one week away from our tentative date for gdb-7.6 release,
> > and I was wondering how we are doing, and whether there might be
> > some issues that might prevent us from releasing around our planned
> > date.
> > 
> > I know of:
> > 
> >   * PR/15289 set remote hardware-watchpoint-limit" broken (zinteger commands)
> >     (regression)
> >     Easy to fix, or just revert the patch that caused the regression?
> > 
> >   * dv-sockser.o build issues in the sim.
> >     Looks like the thread lost steam a bit - can we stoke the fire again?
> 
> I'd like my patch that deals with relocation to be committed to the
> branch.  I don't see it in the list archives, so cannot show a URL,
> but Jan send a few comments that I want to incorporate and submit
> tomorrow.

Committed to the trunk as below.  This incorporates comments from Jan.

OK to commit the same to the 7.6 branch?

2013-03-18  Eli Zaretskii  <eliz@gnu.org>

	* windows-nat.c (windows_get_absolute_argv0): New function.
	* windows-nat.h: Add its prototype.

	* main.c (get_init_files): Use filename_ncmp instead of strncmp.
	Use IS_DIR_SEPARATOR instead of looking for a character inside
	SLASH_STRING.  Include filenames.h.
	(captured_main) [__MINGW32__]: Make argv[0] absolute, so that
	relocate_gdb_directory works when passed gdb_program_name.
	Include windows-nat.h.


--- gdb/main.c~0	2013-01-25 02:46:19.000000000 +0200
+++ gdb/main.c	2013-03-21 19:11:12.039633400 +0200
@@ -43,6 +43,11 @@
 #include "objfiles.h"
 #include "auto-load.h"
 
+#include "filenames.h"
+#ifdef __MINGW32__
+# include "windows-nat.h"
+#endif
+
 /* The selected interpreter.  This will be used as a set command
    variable, so it should always be malloc'ed - since
    do_setshow_command will free it.  */
@@ -180,15 +185,15 @@ get_init_files (char **system_gdbinit,
 	     has been provided, search for SYSTEM_GDBINIT there.  */
 	  if (gdb_datadir_provided
 	      && datadir_len < sys_gdbinit_len
-	      && strncmp (SYSTEM_GDBINIT, GDB_DATADIR, datadir_len) == 0
-	      && strchr (SLASH_STRING, SYSTEM_GDBINIT[datadir_len]) != NULL)
+	      && filename_ncmp (SYSTEM_GDBINIT, GDB_DATADIR, datadir_len) == 0
+	      && IS_DIR_SEPARATOR (SYSTEM_GDBINIT[datadir_len]))
 	    {
 	      /* Append the part of SYSTEM_GDBINIT that follows GDB_DATADIR
 		 to gdb_datadir.  */
 	      char *tmp_sys_gdbinit = xstrdup (SYSTEM_GDBINIT + datadir_len);
 	      char *p;
 
-	      for (p = tmp_sys_gdbinit; strchr (SLASH_STRING, *p); ++p)
+	      for (p = tmp_sys_gdbinit; IS_DIR_SEPARATOR (*p); ++p)
 		continue;
 	      relocated_sysgdbinit = concat (gdb_datadir, SLASH_STRING, p,
 					     NULL);
@@ -377,7 +382,13 @@ captured_main (void *data)
   gdb_stdtargerr = gdb_stderr;	/* for moment */
   gdb_stdtargin = gdb_stdin;	/* for moment */
 
+#ifdef __MINGW32__
+  /* On Windows, argv[0] is not necessarily set to absolute form when
+     GDB is found along PATH, without which relocation doesn't work.  */
+  gdb_program_name = windows_get_absolute_argv0 (argv[0]);
+#else
   gdb_program_name = xstrdup (argv[0]);
+#endif
 
   if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)))
     /* Don't use *_filtered or warning() (which relies on
@@ -411,7 +422,7 @@ captured_main (void *data)
 
 #ifdef RELOC_SRCDIR
   add_substitute_path_rule (RELOC_SRCDIR,
-			    make_relative_prefix (argv[0], BINDIR,
+			    make_relative_prefix (gdb_program_name, BINDIR,
 						  RELOC_SRCDIR));
 #endif
 
@@ -729,7 +740,7 @@ captured_main (void *data)
 
   /* Initialize all files.  Give the interpreter a chance to take
      control of the console via the deprecated_init_ui_hook ().  */
-  gdb_init (argv[0]);
+  gdb_init (gdb_program_name);
 
   /* Now that gdb_init has created the initial inferior, we're in
      position to set args for that inferior.  */


--- gdb/windows-nat.c~0	2013-02-27 21:42:26.000000000 +0200
+++ gdb/windows-nat.c	2013-03-21 19:05:21.642985800 +0200
@@ -597,6 +597,18 @@ failed:
   return 0;		/* failure */
 }
 
+/* Return an absolute file name of the running GDB, if possible, or
+   ARGV0 if not.  The return value is in malloc'ed storage.  */
+char *
+windows_get_absolute_argv0 (const char *argv0)
+{
+  char full_name[PATH_MAX];
+
+  if (GetModuleFileName (NULL, full_name, PATH_MAX))
+    return xstrdup (full_name);
+  return xstrdup (argv0);
+}
+
 /* Encapsulate the information required in a call to
    symbol_file_add_args.  */
 struct safe_symbol_file_add_args


--- gdb/windows-nat.h~0	2013-02-12 21:03:54.000000000 +0200
+++ gdb/windows-nat.h	2013-03-21 19:05:19.068969300 +0200
@@ -28,5 +28,9 @@
    whether a given register is a segment register or not.  */
 extern void windows_set_segment_register_p (segment_register_p_ftype *fun);
 
+/* Return argv[0] in absolute form, if possible, or ARGV0 if not.  The
+   return value is in malloc'ed storage.  */
+extern char *windows_get_absolute_argv0 (const char *argv0);
+
 #endif
 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]