summaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2002-04-01 22:01:20 +0000
committerDJ Delorie <dj@delorie.com>2002-04-01 22:01:20 +0000
commit6ae2fdf821a78be0e20f8a514e46a02227efec67 (patch)
tree874c0fd2d2dd895716e091350336cd669e87831a /libiberty
parentaaa9a74aa732c26efd06430949cb89475dda4ab8 (diff)
downloadbinutils-redhat-6ae2fdf821a78be0e20f8a514e46a02227efec67.tar.gz
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog7
-rw-r--r--libiberty/cp-demangle.c8
-rw-r--r--libiberty/dyn-string.c2
3 files changed, 13 insertions, 4 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index feb0379bc1..56bd2312a7 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 a130fd8374..4a91700d54 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 c41d7ccac3..1da76c2110 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