2009-02-04 Tristan Gingold <gingold@adacore.com>

[deliverable/binutils-gdb.git] / gdb / machoread.c

diff --git a/gdb/machoread.c b/gdb/machoread.c
index 56df33f9598d53f5fbf4025b02075203f4a254e5..d8d3bd2285c20b36df6ab9faddfde13cf0cae8ca 100644 (file)
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -538,7 +538,7 @@ macho_symfile_read (struct objfile *objfile, int mainline)
   /* Get symbols from the symbol table only if the file is an executable.
      The symbol table of object files is not relocated and is expected to
      be in the executable.  */
-  if (bfd_get_file_flags (abfd) & EXEC_P)
+  if (bfd_get_file_flags (abfd) & (EXEC_P | DYNAMIC))
     {
       /* Process the normal symbol table first.  */
       storage_needed = bfd_get_symtab_upper_bound (objfile->obfd);
@@ -566,6 +566,12 @@ macho_symfile_read (struct objfile *objfile, int mainline)
       
       install_minimal_symbols (objfile);
 
+      /* Try to read .eh_frame / .debug_frame.  */
+      /* First, locate these sections.  We ignore the result status
+        as it only checks for debug info.  */
+      dwarf2_has_info (objfile);
+      dwarf2_build_frame_info (objfile);
+      
       /* Check for DSYM file.  */
       dsym_bfd = macho_check_dsym (objfile);
       if (dsym_bfd != NULL)
@@ -588,7 +594,7 @@ macho_symfile_read (struct objfile *objfile, int mainline)
          /* Now recurse: read dwarf from dsym.  */
          symbol_file_add_from_bfd (dsym_bfd, 0, NULL, 0, 0);
       
-         /* Don't try to read dwarf2 from main file.  */
+         /* Don't try to read dwarf2 from main file or shared libraries.  */
          return;
        }
     }
@@ -599,9 +605,8 @@ macho_symfile_read (struct objfile *objfile, int mainline)
       dwarf2_build_psymtabs (objfile, mainline);
     }
 
-  /* FIXME: kettenis/20030504: This still needs to be integrated with
-     dwarf2read.c in a better way.  */
-  dwarf2_build_frame_info (objfile);
+  /* Do not try to read .eh_frame/.debug_frame as they are not relocated
+     and dwarf2_build_frame_info cannot deal with unrelocated sections.  */
 
   /* Then the oso.  */
   if (oso_vector != NULL)
@@ -661,10 +666,11 @@ macho_symfile_offsets (struct objfile *objfile,
     {
       const char *bfd_sect_name = osect->the_bfd_section->name;
       int sect_index = osect->the_bfd_section->index;
-
-      if (strcmp (bfd_sect_name, "LC_SEGMENT.__TEXT") == 0)
-       objfile->sect_index_text = sect_index;
-      else if (strcmp (bfd_sect_name, "LC_SEGMENT.__TEXT.__text") == 0)
+      
+      if (strncmp (bfd_sect_name, "LC_SEGMENT.", 11) == 0)
+       bfd_sect_name += 11;
+      if (strcmp (bfd_sect_name, "__TEXT") == 0
+         || strcmp (bfd_sect_name, "__TEXT.__text") == 0)
        objfile->sect_index_text = sect_index;
     }
 }