commit 9493d644c2a2cb3464cf139515be528a6e140ffe
Author: Joel Brobecker <brobecker@adacore.com>
Date:   Wed Apr 22 12:35:50 2009 -0700

        * main.c (captured_main): Move gdbinit lookups further down,
        making sure it's not called until the basename of the gdbinit file
        has been set.

diff --git a/gdb/main.c b/gdb/main.c
index 86607d3..2f6cd75 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -359,8 +359,6 @@ captured_main (void *data)
 	}
     }
 
-  get_init_files (&system_gdbinit, &home_gdbinit, &local_gdbinit);
-
 #ifdef RELOC_SRCDIR
   add_substitute_path_rule (RELOC_SRCDIR,
 			    make_relative_prefix (argv[0], BINDIR,
@@ -778,6 +776,8 @@ Excess command line arguments ignored. (%s%s)\n"),
   quit_pre_print = error_pre_print;
   warning_pre_print = _("\nwarning: ");
 
+  get_init_files (&system_gdbinit, &home_gdbinit, &local_gdbinit);
+
   /* Read and execute the system-wide gdbinit file, if it exists.
      This is done *before* all the command line arguments are
      processed; it sets global parameters, which are independent of