OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cp-demangle.c (__cxa_demangle): Also protect with IN_GLIBCPP_V3.

Browse Source 
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
This commit is contained in:
Phil Edwards 2002-04-01 21:55:12 +00:00
parent 7bf421c163
commit bd7e6f2d20
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libiberty/ChangeLog
View File

@ -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"

8
libiberty/cp-demangle.c
View File

@ -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

2
libiberty/dyn-string.c
View File

@ -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