* win32-nat.c (psapi_module_handle): Remove static.

[deliverable/binutils-gdb.git] / gdb / solib-target.c

diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index 89571a16d81e74b45916697fdc968616fd51b55a..924bc92d7b7b80f5bb4327ba744cbce87bda1bc7 100644 (file)
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -7,7 +7,7 @@
 
    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 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "objfiles.h"
@@ -27,6 +25,7 @@
 #include "symfile.h"
 #include "target.h"
 #include "vec.h"
+#include "solib-target.h"
 
 #include "gdb_string.h"
 
@@ -53,7 +52,7 @@ DEF_VEC_P(lm_info_p);
 
 #if !defined(HAVE_LIBEXPAT)
 
-static VEC(lm_info_p)
+static VEC(lm_info_p) *
 solib_target_parse_libraries (const char *library)
 {
   static int have_warned;
@@ -332,7 +331,8 @@ solib_target_relocate_section_addresses (struct so_list *so,
          so->addr_low = segment_bases[0];
          so->addr_high = (data->segment_bases[i - 1]
                           + data->segment_sizes[i - 1]
-                          /* FIXME this must be needed! + orig_delta */);
+                          + orig_delta);
+         gdb_assert (so->addr_low <= so->addr_high);
 
          free_symfile_segment_data (data);
        }
@@ -360,7 +360,7 @@ solib_target_in_dynsym_resolve_code (CORE_ADDR pc)
   return in_plt_section (pc, NULL);
 }
 
-static struct target_so_ops solib_target_so_ops;
+struct target_so_ops solib_target_so_ops;
 
 extern initialize_file_ftype _initialize_solib_target; /* -Wmissing-prototypes */
 
@@ -380,6 +380,4 @@ _initialize_solib_target (void)
     = solib_target_open_symbol_file_object;
   solib_target_so_ops.in_dynsym_resolve_code
     = solib_target_in_dynsym_resolve_code;
-
-  current_target_so_ops = &solib_target_so_ops;
 }