diff options
| author | Jim Kingdon <jkingdon@engr.sgi.com> | 1993-09-18 21:11:25 +0000 |
|---|---|---|
| committer | Jim Kingdon <jkingdon@engr.sgi.com> | 1993-09-18 21:11:25 +0000 |
| commit | 1fdbc4d17b058ba8b425188fbe77f68987bf2951 (patch) | |
| tree | 06db202a02a69409382c81ccf8f0db39ecb84ca4 | |
| parent | 84d598611e42de0248b0e7689e4ebe062e1699b6 (diff) | |
| download | gdb-1fdbc4d17b058ba8b425188fbe77f68987bf2951.zip gdb-1fdbc4d17b058ba8b425188fbe77f68987bf2951.tar.gz gdb-1fdbc4d17b058ba8b425188fbe77f68987bf2951.tar.bz2 | |
* mipsread.c (parse_type): Don't complain() if we guessed struct
and it was a union, or vice versa.
| -rw-r--r-- | gdb/ChangeLog | 3 | ||||
| -rw-r--r-- | gdb/mipsread.c | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2a174a5..6aecd17 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ Sat Sep 18 10:13:18 1993 Jim Kingdon (kingdon@poseidon.cygnus.com) + * mipsread.c (parse_type): Don't complain() if we guessed struct + and it was a union, or vice versa. + * defs.h (make_cleanup): Change PTR to void * when inside PARAMS. Some of the following is in #ifdef CALL_DUMMY_BREAKPOINT_OFFSET. diff --git a/gdb/mipsread.c b/gdb/mipsread.c index e380150..1c70aa7 100644 --- a/gdb/mipsread.c +++ b/gdb/mipsread.c @@ -1466,12 +1466,22 @@ parse_type (fd, ax, bs, bigend, sym_name) { /* Usually, TYPE_CODE(tp) is already type_code. The main - exception is if we guessed wrong re struct/union/enum. */ - if (TYPE_CODE (tp) != type_code) + exception is if we guessed wrong re struct/union/enum. + But for struct vs. union a wrong guess is harmless, so + don't complain(). */ + if ((TYPE_CODE (tp) == TYPE_CODE_ENUM + && type_code != TYPE_CODE_ENUM) + || (TYPE_CODE (tp) != TYPE_CODE_ENUM + && type_code == TYPE_CODE_ENUM)) { complain (&bad_tag_guess_complaint, sym_name); + } + + if (TYPE_CODE (tp) != type_code) + { TYPE_CODE (tp) = type_code; } + /* Do not set the tag name if it is a compiler generated tag name (.Fxx or .xxfake or empty) for unnamed struct/union/enums. */ if (name[0] == '.' || name[0] == '\0') |