This is the mail archive of the
gdb-patches@sourceware.cygnus.com
mailing list for the GDB project.
[PATCH] Fix add_minsym_to_demangled_hash_table() conflict
- To: GDB Patches <gdb-patches at sourceware dot cygnus dot com>
- Subject: [PATCH] Fix add_minsym_to_demangled_hash_table() conflict
- From: Andrew Cagney <ac131313 at cygnus dot com>
- Date: Mon, 03 Apr 2000 14:39:49 +1000
- Organization: Cygnus Solutions
FYI,
I've committed the attatched (the white space changes were part of the
original patch).
Andrew
Mon Apr 3 14:10:37 2000 Andrew Cagney <cagney@b1.cygnus.com>
* symtab.h (add_minsym_to_demangled_hash_table): Revert 2000-03-29
Daniel Berlin <dan@cgsoftware.com>. Function was static.
* minsyms.c (add_minsym_to_demangled_hash_table): Add prototype.
* gdb-events.h, gdb-events.c, gdb-events.sh: Re-indent.
Index: minsyms.c
===================================================================
RCS file: /cvs/src/src/gdb/minsyms.c,v
retrieving revision 1.4
diff -p -r1.4 minsyms.c
*** minsyms.c 2000/03/30 03:03:23 1.4
--- minsyms.c 2000/04/03 04:33:49
*************** static int
*** 82,87 ****
--- 82,90 ----
compact_minimal_symbols PARAMS ((struct minimal_symbol *, int,
struct objfile *));
+ static void add_minsym_to_demangled_hash_table (struct minimal_symbol *sym,
+ struct minimal_symbol **table);
+
/* Compute a hash code based using the same criteria as `strcmp_iw'. */
unsigned int
Index: symtab.h
===================================================================
RCS file: /cvs/src/src/gdb/symtab.h,v
retrieving revision 1.5
diff -p -r1.5 symtab.h
*** symtab.h 2000/03/30 03:03:23 1.5
--- symtab.h 2000/04/03 04:33:52
*************** struct minimal_symbol
*** 311,317 ****
so it doesn't have to rederive the info constantly (over a serial line).
It is initialized to zero and stays that way until target-dependent code
sets it. Storage for any data pointed to by this field should be allo-
! cated on the symbol_obstack for the associated objfile.
The type would be "void *" except for reasons of compatibility with older
compilers. This field is optional.
--- 311,317 ----
so it doesn't have to rederive the info constantly (over a serial line).
It is initialized to zero and stays that way until target-dependent code
sets it. Storage for any data pointed to by this field should be allo-
! cated on the symbol_obstack for the associated objfile.
The type would be "void *" except for reasons of compatibility with older
compilers. This field is optional.
*************** struct symbol
*** 738,744 ****
symbols whose types we have not parsed yet. For functions, it also
contains their memory address, so we can find them from a PC value.
Each partial_symbol sits in a partial_symtab, all of which are chained
! on a partial symtab list and which points to the corresponding
normal symtab once the partial_symtab has been referenced. */
struct partial_symbol
--- 738,744 ----
symbols whose types we have not parsed yet. For functions, it also
contains their memory address, so we can find them from a PC value.
Each partial_symbol sits in a partial_symtab, all of which are chained
! on a partial symtab list and which points to the corresponding
normal symtab once the partial_symtab has been referenced. */
struct partial_symbol
*************** struct section_offsets
*** 837,843 ****
(sizeof (struct section_offsets) \
+ sizeof (((struct section_offsets *) 0)->offsets) * (SECT_OFF_MAX-1))
! /* Each source file or header is represented by a struct symtab.
These objects are chained through the `next' field. */
struct symtab
--- 837,843 ----
(sizeof (struct section_offsets) \
+ sizeof (((struct section_offsets *) 0)->offsets) * (SECT_OFF_MAX-1))
! /* Each source file or header is represented by a struct symtab.
These objects are chained through the `next' field. */
struct symtab
*************** struct partial_symtab
*** 1032,1038 ****
/* The virtual function table is now an array of structures which have the
! form { int16 offset, delta; void *pfn; }.
In normal virtual function tables, OFFSET is unused.
DELTA is the amount which is added to the apparent object's base
--- 1032,1038 ----
/* The virtual function table is now an array of structures which have the
! form { int16 offset, delta; void *pfn; }.
In normal virtual function tables, OFFSET is unused.
DELTA is the amount which is added to the apparent object's base
*************** extern unsigned int msymbol_hash PARAMS
*** 1240,1248 ****
extern void
add_minsym_to_hash_table (struct minimal_symbol *sym,
struct minimal_symbol **table);
- extern void
- add_minsym_to_demangled_hash_table (struct minimal_symbol *sym,
- struct minimal_symbol **table);
extern struct minimal_symbol *
lookup_minimal_symbol PARAMS ((const char *, const char *, struct objfile *));
--- 1240,1245 ----