Merge GDB 7.5.1

gdb/solib-svr4.c

 /* Handle SVR4 shared libraries for GDB, the GNU Debugger.
 
    Copyright (C) 1990-1996, 1998-2001, 2003-2012 Free Software
    Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
@@ skipping 1252 matching lines @@
 svr4_current_sos (void)
 {
   CORE_ADDR lm;
   struct so_list *head = NULL;
   struct so_list **link_ptr = &head;
   struct svr4_info *info;
   struct cleanup *back_to;
   int ignore_first;
   struct svr4_library_list library_list;
 
+  /* Fall back to manual examination of the target if the packet is not
+     supported or gdbserver failed to find DT_DEBUG.  gdb.server/solib-list.exp
+     tests a case where gdbserver cannot find the shared libraries list while
+     GDB itself is able to find it via SYMFILE_OBJFILE.
+
+     Unfortunately statically linked inferiors will also fall back through this
+     suboptimal code path.  */
+
   if (svr4_current_sos_via_xfer_libraries (&library_list))
     {
       if (library_list.main_lm)
         {
           info = get_svr4_info ();
           info->main_lm_addr = library_list.main_lm;
         }
 
       return library_list.head ? library_list.head : svr4_default_sos ();
     }
@@ skipping 419 matching lines @@
         {
           sym_addr = SYMBOL_VALUE_ADDRESS (msymbol);
           sym_addr = gdbarch_convert_from_func_ptr_addr (target_gdbarch,
                                                          sym_addr,
                                                          &current_target);
           create_solib_event_breakpoint (target_gdbarch, sym_addr);
           return 1;
         }
     }
 
-  if (!current_inferior ()->attach_flag)
+  if (interp_name != NULL && !current_inferior ()->attach_flag)
     {
       for (bkpt_namep = bkpt_names; *bkpt_namep != NULL; bkpt_namep++)
         {
           msymbol = lookup_minimal_symbol (*bkpt_namep, NULL, symfile_objfile);
           if ((msymbol != NULL) && (SYMBOL_VALUE_ADDRESS (msymbol) != 0))
             {
               sym_addr = SYMBOL_VALUE_ADDRESS (msymbol);
               sym_addr = gdbarch_convert_from_func_ptr_addr (target_gdbarch,
                                                              sym_addr,
                                                              &current_target);
@@ skipping 529 matching lines @@
      Now run the target.  It will eventually hit the breakpoint, at
      which point all of the libraries will have been mapped in and we
      can go groveling around in the dynamic linker structures to find
      out what we need to know about them.  */
 
   inf = current_inferior ();
   tp = inferior_thread ();
 
   clear_proceed_status ();
   inf->control.stop_soon = STOP_QUIETLY;
-  tp->suspend.stop_signal = TARGET_SIGNAL_0;
+  tp->suspend.stop_signal = GDB_SIGNAL_0;
   do
     {
       target_resume (pid_to_ptid (-1), 0, tp->suspend.stop_signal);
       wait_for_inferior ();
     }
-  while (tp->suspend.stop_signal != TARGET_SIGNAL_TRAP);
+  while (tp->suspend.stop_signal != GDB_SIGNAL_TRAP);
   inf->control.stop_soon = NO_STOP_QUIETLY;
 #endif /* defined(_SCO_DS) */
 }
 
 static void
 svr4_clear_solib (void)
 {
   struct svr4_info *info;
 
   info = get_svr4_info ();
@@ skipping 247 matching lines @@
   svr4_so_ops.solib_create_inferior_hook = svr4_solib_create_inferior_hook;
   svr4_so_ops.special_symbol_handling = svr4_special_symbol_handling;
   svr4_so_ops.current_sos = svr4_current_sos;
   svr4_so_ops.open_symbol_file_object = open_symbol_file_object;
   svr4_so_ops.in_dynsym_resolve_code = svr4_in_dynsym_resolve_code;
   svr4_so_ops.bfd_open = solib_bfd_open;
   svr4_so_ops.lookup_lib_global_symbol = elf_lookup_lib_symbol;
   svr4_so_ops.same = svr4_same;
   svr4_so_ops.keep_data_in_core = svr4_keep_data_in_core;
 }