* config/obj-aout.h: Fix comment typos.

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

diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index da02f794a7374ee1394eda53e3709fb8a003fdda..df35956ea14da386646eaf88d6438a56eb06326d 100644 (file)
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -205,7 +205,8 @@ lookup_minimal_symbol (const char *name, const char *sfile,
                       case mst_file_data:
                       case mst_file_bss:
 #ifdef SOFUN_ADDRESS_MAYBE_MISSING
-                        if (sfile == NULL || STREQ (msymbol->filename, sfile))
+                        if (sfile == NULL
+                           || strcmp (msymbol->filename, sfile) == 0)
                           found_file_symbol = msymbol;
 #else
                         /* We have neither the ability nor the need to
@@ -610,6 +611,7 @@ prim_record_minimal_symbol_and_info (const char *name, CORE_ADDR address,
   MSYMBOL_TYPE (msymbol) = ms_type;
   /* FIXME:  This info, if it remains, needs its own field.  */
   MSYMBOL_INFO (msymbol) = info;       /* FIXME! */
+  MSYMBOL_SIZE (msymbol) = 0;
 
   /* The hash pointers must be cleared! If they're not,
      add_minsym_to_hash_table will NOT add this msymbol to the hash table. */
@@ -737,10 +739,10 @@ compact_minimal_symbols (struct minimal_symbol *msymbol, int mcount,
       copyfrom = copyto = msymbol;
       while (copyfrom < msymbol + mcount - 1)
        {
-         if (SYMBOL_VALUE_ADDRESS (copyfrom) ==
-             SYMBOL_VALUE_ADDRESS ((copyfrom + 1)) &&
-             (STREQ (SYMBOL_LINKAGE_NAME (copyfrom),
-                     SYMBOL_LINKAGE_NAME ((copyfrom + 1)))))
+         if (SYMBOL_VALUE_ADDRESS (copyfrom)
+             == SYMBOL_VALUE_ADDRESS ((copyfrom + 1))
+             && strcmp (SYMBOL_LINKAGE_NAME (copyfrom),
+                        SYMBOL_LINKAGE_NAME ((copyfrom + 1))) == 0)
            {
              if (MSYMBOL_TYPE ((copyfrom + 1)) == mst_unknown)
                {
@@ -889,6 +891,7 @@ install_minimal_symbols (struct objfile *objfile)
       SYMBOL_LINKAGE_NAME (&msymbols[mcount]) = NULL;
       SYMBOL_VALUE_ADDRESS (&msymbols[mcount]) = 0;
       MSYMBOL_INFO (&msymbols[mcount]) = NULL;
+      MSYMBOL_SIZE (&msymbols[mcount]) = 0;
       MSYMBOL_TYPE (&msymbols[mcount]) = mst_unknown;
       SYMBOL_INIT_LANGUAGE_SPECIFIC (&msymbols[mcount], language_unknown);
 
@@ -975,8 +978,8 @@ find_solib_trampoline_target (CORE_ADDR pc)
       ALL_MSYMBOLS (objfile, msymbol)
       {
        if (MSYMBOL_TYPE (msymbol) == mst_text
-           && STREQ (SYMBOL_LINKAGE_NAME (msymbol),
-                     SYMBOL_LINKAGE_NAME (tsymbol)))
+           && strcmp (SYMBOL_LINKAGE_NAME (msymbol),
+                      SYMBOL_LINKAGE_NAME (tsymbol)) == 0)
          return SYMBOL_VALUE_ADDRESS (msymbol);
       }
     }