* objfiles.c (objfile_relocate): Relocate ei.entry_point with

	its section offset, use SECT_OFF_TEXT only as a fallback.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 95d9d652ee35a1c86f98a0d732623f5cb1f09639..ca5db2f19b5fb9b4c08aa6128e7a540b9ce5a716 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-03  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
+
+       * objfiles.c (objfile_relocate):  Relocate ei.entry_point with
+       its section offset, use SECT_OFF_TEXT only as a fallback.
+
 2000-11-01  Kevin Buettner  <kevinb@redhat.com>
 
        * symm-nat.c (print_1167_regs): Remove extraneous blank line

diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 60c8c6e680e0bb9f5411c947e21ee152599257de..19e95b573a314085bb18690fae5b68d5770cf53c 100644 (file)
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -642,6 +642,18 @@ objfile_relocate (struct objfile *objfile, struct section_offsets *new_offsets)
       (objfile->section_offsets)->offsets[i] = ANOFFSET (new_offsets, i);
   }
 
+  if (objfile->ei.entry_point != ~(CORE_ADDR) 0)
+    {
+      /* Relocate ei.entry_point with its section offset, use SECT_OFF_TEXT
+        only as a fallback.  */
+      struct obj_section *s;
+      s = find_pc_section (objfile->ei.entry_point);
+      if (s)
+        objfile->ei.entry_point += ANOFFSET (delta, s->the_bfd_section->index);
+      else
+        objfile->ei.entry_point += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+    }
+
   {
     struct obj_section *s;
     bfd *abfd;
@@ -657,9 +669,6 @@ objfile_relocate (struct objfile *objfile, struct section_offsets *new_offsets)
       }
   }
 
-  if (objfile->ei.entry_point != ~(CORE_ADDR) 0)
-    objfile->ei.entry_point += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
-
   if (objfile->ei.entry_func_lowpc != INVALID_ENTRY_LOWPC)
     {
       objfile->ei.entry_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile));