Merge from mainline.
This commit is contained in:
parent
a2beb3b1b7
commit
373857e0f6
|
@ -1,3 +1,7 @@
|
|||
2000-10-23 Philip Blundell <pb@futuretv.com>
|
||||
|
||||
* demangle.h, dyn-string.h: Update from trunk version.
|
||||
|
||||
2000-05-26 Eli Zaretskii <eliz@is.elta.co.il>
|
||||
|
||||
* filenames.h: New file.
|
||||
|
|
|
@ -33,12 +33,14 @@
|
|||
#define DMGL_GNU (1 << 9)
|
||||
#define DMGL_LUCID (1 << 10)
|
||||
#define DMGL_ARM (1 << 11)
|
||||
#define DMGL_HP (1 << 12) /* For the HP aCC compiler; same as ARM
|
||||
except for template arguments, etc. */
|
||||
#define DMGL_HP (1 << 12) /* For the HP aCC compiler;
|
||||
same as ARM except for
|
||||
template arguments, etc. */
|
||||
#define DMGL_EDG (1 << 13)
|
||||
#define DMGL_GNU_NEW_ABI (1 << 14)
|
||||
|
||||
/* If none of these are set, use 'current_demangling_style' as the default. */
|
||||
#define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU|DMGL_LUCID|DMGL_ARM|DMGL_HP|DMGL_EDG)
|
||||
#define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU|DMGL_LUCID|DMGL_ARM|DMGL_HP|DMGL_EDG|DMGL_GNU_NEW_ABI)
|
||||
|
||||
/* Enumeration of possible demangling styles.
|
||||
|
||||
|
@ -56,7 +58,8 @@ extern enum demangling_styles
|
|||
lucid_demangling = DMGL_LUCID,
|
||||
arm_demangling = DMGL_ARM,
|
||||
hp_demangling = DMGL_HP,
|
||||
edg_demangling = DMGL_EDG
|
||||
edg_demangling = DMGL_EDG,
|
||||
gnu_new_abi_demangling = DMGL_GNU_NEW_ABI
|
||||
} current_demangling_style;
|
||||
|
||||
/* Define string names for the various demangling styles. */
|
||||
|
@ -67,6 +70,7 @@ extern enum demangling_styles
|
|||
#define ARM_DEMANGLING_STYLE_STRING "arm"
|
||||
#define HP_DEMANGLING_STYLE_STRING "hp"
|
||||
#define EDG_DEMANGLING_STYLE_STRING "edg"
|
||||
#define GNU_NEW_ABI_DEMANGLING_STYLE_STRING "gnu-new-abi"
|
||||
|
||||
/* Some macros to test what demangling style is active. */
|
||||
|
||||
|
@ -77,6 +81,17 @@ extern enum demangling_styles
|
|||
#define ARM_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_ARM)
|
||||
#define HP_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_HP)
|
||||
#define EDG_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_EDG)
|
||||
#define GNU_NEW_ABI_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_GNU_NEW_ABI)
|
||||
|
||||
/* Provide information about the available demangle styles. This code is
|
||||
pulled from gdb into libiberty because it is useful to binutils also. */
|
||||
|
||||
extern struct demangler_engine
|
||||
{
|
||||
const char *demangling_style_name;
|
||||
enum demangling_styles demangling_style;
|
||||
const char *demangling_style_doc;
|
||||
} libiberty_demanglers[];
|
||||
|
||||
extern char *
|
||||
cplus_demangle PARAMS ((const char *mangled, int options));
|
||||
|
@ -92,4 +107,14 @@ cplus_mangle_opname PARAMS ((const char *opname, int options));
|
|||
extern void
|
||||
set_cplus_marker_for_demangling PARAMS ((int ch));
|
||||
|
||||
extern enum demangling_styles
|
||||
cplus_demangle_set_style PARAMS ((enum demangling_styles style));
|
||||
|
||||
extern enum demangling_styles
|
||||
cplus_demangle_name_to_style PARAMS ((const char *name));
|
||||
|
||||
/* New-ABI demangling entry point, defined in cp-demangle.c. */
|
||||
extern char*
|
||||
cplus_demangle_new_abi PARAMS ((const char* mangled));
|
||||
|
||||
#endif /* DEMANGLE_H */
|
||||
|
|
Loading…
Reference in New Issue