diff options
| author | DJ Delorie <dj@redhat.com> | 2002-04-01 22:01:20 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2002-04-01 22:01:20 +0000 |
| commit | 0c4460bb3cd58e4f6d4d1aaea52afd62eabda37d (patch) | |
| tree | 487af46ba4bee21c88cf84a98359e7024be3d59f /libiberty/cp-demangle.c | |
| parent | d2b645005b08c5a9ac48b4e1f5266a25c7716ed4 (diff) | |
| download | gdb-0c4460bb3cd58e4f6d4d1aaea52afd62eabda37d.zip gdb-0c4460bb3cd58e4f6d4d1aaea52afd62eabda37d.tar.gz gdb-0c4460bb3cd58e4f6d4d1aaea52afd62eabda37d.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty/cp-demangle.c')
| -rw-r--r-- | libiberty/cp-demangle.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index a130fd8..4a91700 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -3577,7 +3577,7 @@ cp_demangle_type (type_name, result) return status; } -#ifdef IN_LIBGCC2 +#if defined(IN_LIBGCC2) || defined(IN_GLIBCPP_V3) extern char *__cxa_demangle PARAMS ((const char *, char *, size_t *, int *)); /* ia64 ABI-mandated entry point in the C++ runtime library for performing @@ -3685,7 +3685,7 @@ __cxa_demangle (mangled_name, output_buffer, length, status) } } -#else /* !IN_LIBGCC2 */ +#else /* ! (IN_LIBGCC2 || IN_GLIBCPP_V3) */ /* Variant entry point for integration with the existing cplus-dem demangler. Attempts to demangle MANGLED. If the demangling @@ -3854,7 +3854,7 @@ java_demangle_v3 (mangled) return return_value; } -#endif /* IN_LIBGCC2 */ +#endif /* IN_LIBGCC2 || IN_GLIBCPP_V3 */ /* Demangle NAME in the G++ V3 ABI demangling style, and return either @@ -3894,6 +3894,7 @@ demangle_v3_with_details (name) } +#ifndef IN_GLIBCPP_V3 /* Return non-zero iff NAME is the mangled form of a constructor name in the G++ V3 ABI demangling style. Specifically, return: - '1' if NAME is a complete object constructor, @@ -3936,6 +3937,7 @@ is_gnu_v3_mangled_dtor (name) else return 0; } +#endif /* IN_GLIBCPP_V3 */ #ifdef STANDALONE_DEMANGLER |