diff options
| author | Phil Edwards <pme@gcc.gnu.org> | 2002-04-01 21:55:12 +0000 |
|---|---|---|
| committer | Phil Edwards <pme@gcc.gnu.org> | 2002-04-01 21:55:12 +0000 |
| commit | bd7e6f2d207b371f0699d092f0e5a3efd31eb5e0 (patch) | |
| tree | 109b3bc7a1238e3c14897e24e922cb7fadb46de0 /libiberty | |
| parent | 7bf421c16301f02682bb73fe7d726d2572da2042 (diff) | |
| download | gcc-bd7e6f2d207b371f0699d092f0e5a3efd31eb5e0.zip gcc-bd7e6f2d207b371f0699d092f0e5a3efd31eb5e0.tar.gz gcc-bd7e6f2d207b371f0699d092f0e5a3efd31eb5e0.tar.bz2 | |
cp-demangle.c (__cxa_demangle): Also protect with IN_GLIBCPP_V3.
2002-04-01 Phil Edwards <pme@gcc.gnu.org>
* cp-demangle.c (__cxa_demangle): Also protect with IN_GLIBCPP_V3.
(is_gnu_v3_mangled_ctor, is_gnu_v3_mangled_ctor): Conditionally
not compile if IN_GLIBCPP_V3 defined.
* dyn-string.c: Also allow IN_GLIBCPP_V3 to change allocation scheme.
From-SVN: r51708
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 7 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 8 | ||||
| -rw-r--r-- | libiberty/dyn-string.c | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index bc943fe..ae06bfc 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,10 @@ +2002-04-01 Phil Edwards <pme@gcc.gnu.org> + + * cp-demangle.c (__cxa_demangle): Also protect with IN_GLIBCPP_V3. + (is_gnu_v3_mangled_ctor, is_gnu_v3_mangled_ctor): Conditionally + not compile if IN_GLIBCPP_V3 defined. + * dyn-string.c: Also allow IN_GLIBCPP_V3 to change allocation scheme. + 2002-03-30 Bryce McKinlay <bryce@waitaki.otago.ac.nz> * cp-demangle.c (java_demangle_v3): Don't try to release "demangled" 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 diff --git a/libiberty/dyn-string.c b/libiberty/dyn-string.c index c41d7cca..1da76c2 100644 --- a/libiberty/dyn-string.c +++ b/libiberty/dyn-string.c @@ -50,7 +50,7 @@ Boston, MA 02111-1307, USA. */ abort if an allocation fails. Instead, percolate an error code up through the call chain. */ -#ifdef IN_LIBGCC2 +#if defined(IN_LIBGCC2) || defined(IN_GLIBCPP_V3) #define RETURN_ON_ALLOCATION_FAILURE #endif |