diff options
| author | DJ Delorie <dj@redhat.com> | 2002-07-09 01:01:18 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2002-07-09 01:01:18 +0000 |
| commit | 2a9dffbf14dfaf9ee901a744a747f16b5e5ca84a (patch) | |
| tree | 3556e909499343763b92b74e6af81cd6cf2deed5 | |
| parent | 6030b50afa1566a8f82bb677c700bd04ff87bc17 (diff) | |
| download | gdb-2a9dffbf14dfaf9ee901a744a747f16b5e5ca84a.zip gdb-2a9dffbf14dfaf9ee901a744a747f16b5e5ca84a.tar.gz gdb-2a9dffbf14dfaf9ee901a744a747f16b5e5ca84a.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index cba9742..861af6e 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2002-07-08 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * cp-demangle.c (demangle_v3_with_details): Wrap in + !defined IN_GLIBCPP_V3. + 2002-07-01 Mark Mitchell <mark@codesourcery.com> * cp-demangle.c (demangle_operator_name): Add type_arg parameter. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 162aafca..e3ef42c 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -3880,6 +3880,7 @@ java_demangle_v3 (mangled) #endif /* IN_LIBGCC2 || IN_GLIBCPP_V3 */ +#ifndef IN_GLIBCPP_V3 /* Demangle NAME in the G++ V3 ABI demangling style, and return either zero, indicating that some error occurred, or a demangling_t holding the results. */ @@ -3917,7 +3918,6 @@ 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, |