Add command support for Guile.

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

diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index ba8616f7bede134a0521b104fb47ef370ac6ea74..5171f50dd018c5de6990309d04e63d8a59aed409 100644 (file)
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -1045,20 +1045,14 @@ read_dbx_dynamic_symtab (struct objfile *objfile)
 
          if (bfd_get_section_flags (abfd, sec) & SEC_CODE)
            {
-             sym_value += ANOFFSET (objfile->section_offsets,
-                                    SECT_OFF_TEXT (objfile));
              type = N_TEXT;
            }
          else if (bfd_get_section_flags (abfd, sec) & SEC_DATA)
            {
-             sym_value += ANOFFSET (objfile->section_offsets,
-                                    SECT_OFF_DATA (objfile));
              type = N_DATA;
            }
          else if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
            {
-             sym_value += ANOFFSET (objfile->section_offsets,
-                                    SECT_OFF_BSS (objfile));
              type = N_BSS;
            }
          else
@@ -1098,9 +1092,7 @@ read_dbx_dynamic_symtab (struct objfile *objfile)
        counter++, relptr++)
     {
       arelent *rel = *relptr;
-      CORE_ADDR address =
-       rel->address + ANOFFSET (objfile->section_offsets,
-                                SECT_OFF_DATA (objfile));
+      CORE_ADDR address = rel->address;
 
       switch (bfd_get_arch (abfd))
        {
@@ -1170,7 +1162,7 @@ find_stab_function_addr (char *namestring, const char *filename,
       msym = lookup_minimal_symbol (p, NULL, objfile);
     }
 
-  return msym.minsym == NULL ? 0 : MSYMBOL_VALUE_ADDRESS (msym.minsym);
+  return msym.minsym == NULL ? 0 : BMSYMBOL_VALUE_ADDRESS (msym);
 }
 
 static void
@@ -1326,22 +1318,16 @@ read_dbx_symtab (struct objfile *objfile)
 
        case N_TEXT | N_EXT:
        case N_NBTEXT | N_EXT:
-         nlist.n_value += ANOFFSET (objfile->section_offsets,
-                                    SECT_OFF_TEXT (objfile));
          goto record_it;
 
        case N_DATA | N_EXT:
        case N_NBDATA | N_EXT:
-         nlist.n_value += ANOFFSET (objfile->section_offsets,
-                                    SECT_OFF_DATA (objfile));
          goto record_it;
 
        case N_BSS:
        case N_BSS | N_EXT:
        case N_NBBSS | N_EXT:
        case N_SETV | N_EXT:            /* FIXME, is this in BSS? */
-         nlist.n_value += ANOFFSET (objfile->section_offsets,
-                                    SECT_OFF_BSS (objfile));
          goto record_it;
 
        case N_ABS | N_EXT:
@@ -1364,14 +1350,15 @@ read_dbx_symtab (struct objfile *objfile)
        case N_FN:
        case N_FN_SEQ:
        case N_TEXT:
-         nlist.n_value += ANOFFSET (objfile->section_offsets,
-                                    SECT_OFF_TEXT (objfile));
          namestring = set_namestring (objfile, &nlist);
 
          if ((namestring[0] == '-' && namestring[1] == 'l')
              || (namestring[(nsl = strlen (namestring)) - 1] == 'o'
                  && namestring[nsl - 2] == '.'))
            {
+             nlist.n_value += ANOFFSET (objfile->section_offsets,
+                                        SECT_OFF_TEXT (objfile));
+
              if (past_first_source_file && pst
                  /* The gould NP1 uses low values for .o and -l symbols
                     which are not the address.  */
@@ -1396,8 +1383,6 @@ read_dbx_symtab (struct objfile *objfile)
          continue;
 
        case N_DATA:
-         nlist.n_value += ANOFFSET (objfile->section_offsets,
-                                    SECT_OFF_DATA (objfile));
          goto record_it;
 
        case N_UNDF | N_EXT:
@@ -2278,7 +2263,7 @@ end_psymtab (struct objfile *objfile, struct partial_symtab *pst,
        }
 
       if (minsym.minsym)
-       pst->texthigh = (MSYMBOL_VALUE_ADDRESS (minsym.minsym)
+       pst->texthigh = (BMSYMBOL_VALUE_ADDRESS (minsym)
                         + MSYMBOL_SIZE (minsym.minsym));
 
       last_function_name = NULL;