merge from gcc

This commit is contained in:
DJ Delorie 2009-03-18 00:07:38 +00:00
parent d99179dbf3
commit cb55223679
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2009-03-17 Jason Merrill <jason@redhat.com>
* demangle.h (enum demangle_component_type): Add
DEMANGLE_COMPONENT_FUNCTION_PARAM.
2009-03-14 Dave Korn <dave.korn.cygwin@gmail.com> 2009-03-14 Dave Korn <dave.korn.cygwin@gmail.com>
* coff/internal.h (struct internal_extra_pe_aouthdr): Correct type * coff/internal.h (struct internal_extra_pe_aouthdr): Correct type

View File

@ -221,6 +221,8 @@ enum demangle_component_type
/* A template parameter. This holds a number, which is the template /* A template parameter. This holds a number, which is the template
parameter index. */ parameter index. */
DEMANGLE_COMPONENT_TEMPLATE_PARAM, DEMANGLE_COMPONENT_TEMPLATE_PARAM,
/* A function parameter. This holds a number, which is the index. */
DEMANGLE_COMPONENT_FUNCTION_PARAM,
/* A constructor. This holds a name and the kind of /* A constructor. This holds a name and the kind of
constructor. */ constructor. */
DEMANGLE_COMPONENT_CTOR, DEMANGLE_COMPONENT_CTOR,
@ -466,10 +468,10 @@ struct demangle_component
int len; int len;
} s_string; } s_string;
/* For DEMANGLE_COMPONENT_TEMPLATE_PARAM. */ /* For DEMANGLE_COMPONENT_*_PARAM. */
struct struct
{ {
/* Template parameter index. */ /* Parameter index. */
long number; long number;
} s_number; } s_number;