* main.c (captured_main): Move gdbinit lookups after gdb_init.

This commit is contained in:
Jerome Guitton 2009-04-27 10:24:08 +00:00
parent d389af10b7
commit 57a460012a
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2009-04-27 Jerome Guitton <guitton@adacore.com>
* main.c (captured_main): Move gdbinit lookups after gdb_init.
2009-04-27 Jan Kratochvil <jan.kratochvil@redhat.com>
PR gdb/9675:

View File

@ -346,8 +346,6 @@ captured_main (void *data)
gdb_datadir = relocate_directory (argv[0], GDB_DATADIR,
GDB_DATADIR_RELOCATABLE);
get_init_files (&system_gdbinit, &home_gdbinit, &local_gdbinit);
#ifdef RELOC_SRCDIR
add_substitute_path_rule (RELOC_SRCDIR,
make_relative_prefix (argv[0], BINDIR,
@ -689,6 +687,11 @@ Excess command line arguments ignored. (%s%s)\n"),
control of the console via the deprecated_init_ui_hook (). */
gdb_init (argv[0]);
/* Lookup gdbinit files. Note that the gdbinit file name may be overriden
during file initialization, so get_init_files should be called after
gdb_init. */
get_init_files (&system_gdbinit, &home_gdbinit, &local_gdbinit);
/* Do these (and anything which might call wrap_here or *_filtered)
after initialize_all_files() but before the interpreter has been
installed. Otherwize the help/version messages will be eaten by