* config/m68k/monitor.mt (TDEPFILE): Add remote-es.o.

[deliverable/binutils-gdb.git] / gdb / gdb-stabs.h

diff --git a/gdb/gdb-stabs.h b/gdb/gdb-stabs.h
index e9a2c5436f82ba6aab70943fe42ffeecaf75d4cb..c1e0253842edece7d8e74ca2164c0c304e890c8a 100644 (file)
--- a/gdb/gdb-stabs.h
+++ b/gdb/gdb-stabs.h
@@ -18,11 +18,11 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* This file exists to hold the common definitions required of all the
-   symbol-readers that end up using stabs.  The common use of these 
-   `symbol-type-specific' customizations of the generic data structures
-   makes the stabs-oriented symbol readers able to call each others'
-   functions as required.  */
+/* This file exists to hold the common definitions required of most of
+   the symbol-readers that end up using stabs.  The common use of
+   these `symbol-type-specific' customizations of the generic data
+   structures makes the stabs-oriented symbol readers able to call
+   each others' functions as required.  */
 
 #if !defined (GDBSTABS_H)
 #define GDBSTABS_H
@@ -51,7 +51,7 @@ struct stab_section_info {
 };
 
 /* Information is passed among various dbxread routines for accessing
-   symbol files.  A pointer to this structure is kept in the sym_private
+   symbol files.  A pointer to this structure is kept in the sym_stab_info
    field of the objfile struct.  */
  
 struct dbx_symfile_info {
@@ -63,24 +63,14 @@ struct dbx_symfile_info {
   int symbol_size;             /* Bytes in a single symbol */
   struct stab_section_info *stab_section_info;         /* section starting points
                                   of the original .o files before linking. */
-/* FIXME:  HP kludges that shouldn't be here.  */
-  int hp_symcount;
-  char *hp_stringtab;
-  int hp_stringtab_size;
-  file_ptr hp_symtab_offset;
 };
 
-#define DBX_SYMFILE_INFO(o)    ((struct dbx_symfile_info *)((o)->sym_private))
+#define DBX_SYMFILE_INFO(o)    ((struct dbx_symfile_info *)((o)->sym_stab_info))
 #define DBX_TEXT_SECT(o)       (DBX_SYMFILE_INFO(o)->text_sect)
 #define DBX_SYMCOUNT(o)                (DBX_SYMFILE_INFO(o)->symcount)
 #define DBX_STRINGTAB(o)       (DBX_SYMFILE_INFO(o)->stringtab)
 #define DBX_STRINGTAB_SIZE(o)  (DBX_SYMFILE_INFO(o)->stringtab_size)
 #define DBX_SYMTAB_OFFSET(o)   (DBX_SYMFILE_INFO(o)->symtab_offset)
 #define DBX_SYMBOL_SIZE(o)     (DBX_SYMFILE_INFO(o)->symbol_size)
-/* We don't use a macro for stab_section_info.  */
-#define HP_SYMCOUNT(o)         (DBX_SYMFILE_INFO(o)->hp_symcount)
-#define HP_STRINGTAB(o)                (DBX_SYMFILE_INFO(o)->hp_stringtab)
-#define HP_STRINGTAB_SIZE(o)   (DBX_SYMFILE_INFO(o)->hp_stringtab_size)
-#define HP_SYMTAB_OFFSET(o)    (DBX_SYMFILE_INFO(o)->hp_symtab_offset)
 
 #endif /* GDBSTABS_H */