espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-10-18 13:23:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge from gcc

Browse Source
This commit is contained in:
DJ Delorie
2002-04-01 22:01:20 +00:00
parent d2b645005b
commit 0c4460bb3c
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/ChangeLog
View File

@ -1,3 +1,7 @@
2002-04-01 Phil Edwards <pme@gcc.gnu.org>
* dyn-string.h: Also allow IN_GLIBCPP_V3 to redefine names.
2002-03-10 Daniel Jacobowitz <drow@mvista.com> 2002-03-10 Daniel Jacobowitz <drow@mvista.com>
* gdb: New directory. * gdb: New directory.

6
include/dyn-string.h
View File

@ -1,5 +1,5 @@
/* An abstract string datatype. /* An abstract string datatype.
Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
Contributed by Mark Mitchell (mark@markmitchell.com). Contributed by Mark Mitchell (mark@markmitchell.com).
This file is part of GCC. This file is part of GCC.
@ -45,7 +45,7 @@ typedef struct dyn_string
names in user programs, the functions that are used in the names in user programs, the functions that are used in the
demangler are given implementation-reserved names. */ demangler are given implementation-reserved names. */
#ifdef IN_LIBGCC2 #if defined(IN_LIBGCC2) || defined(IN_GLIBCPP_V3)
#define dyn_string_init __cxa_dyn_string_init #define dyn_string_init __cxa_dyn_string_init
#define dyn_string_new __cxa_dyn_string_new #define dyn_string_new __cxa_dyn_string_new
@ -66,7 +66,7 @@ typedef struct dyn_string
#define dyn_string_substring __cxa_dyn_string_substring #define dyn_string_substring __cxa_dyn_string_substring
#define dyn_string_eq __cxa_dyn_string_eq #define dyn_string_eq __cxa_dyn_string_eq
#endif /* IN_LIBGCC2 */ #endif /* IN_LIBGCC2 || IN_GLIBCPP_V3 */
extern int dyn_string_init PARAMS ((struct dyn_string *, int)); extern int dyn_string_init PARAMS ((struct dyn_string *, int));

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> 2002-03-30 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* cp-demangle.c (java_demangle_v3): Don't try to release "demangled" * 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; return status;
} }
#ifdef IN_LIBGCC2 #if defined(IN_LIBGCC2) || defined(IN_GLIBCPP_V3)
extern char *__cxa_demangle PARAMS ((const char *, char *, size_t *, int *)); extern char *__cxa_demangle PARAMS ((const char *, char *, size_t *, int *));
/* ia64 ABI-mandated entry point in the C++ runtime library for performing /* 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 /* Variant entry point for integration with the existing cplus-dem
demangler. Attempts to demangle MANGLED. If the demangling demangler. Attempts to demangle MANGLED. If the demangling
@ -3854,7 +3854,7 @@ java_demangle_v3 (mangled)
return return_value; return return_value;
} }
#endif /* IN_LIBGCC2 */ #endif /* IN_LIBGCC2 || IN_GLIBCPP_V3 */
/* Demangle NAME in the G++ V3 ABI demangling style, and return either /* 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 /* Return non-zero iff NAME is the mangled form of a constructor name
in the G++ V3 ABI demangling style. Specifically, return: in the G++ V3 ABI demangling style. Specifically, return:
- '1' if NAME is a complete object constructor, - '1' if NAME is a complete object constructor,
@ -3936,6 +3937,7 @@ is_gnu_v3_mangled_dtor (name)
else else
return 0; return 0;
} }
#endif /* IN_GLIBCPP_V3 */
#ifdef STANDALONE_DEMANGLER #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 abort if an allocation fails. Instead, percolate an error code up
through the call chain. */ through the call chain. */
#ifdef IN_LIBGCC2 #if defined(IN_LIBGCC2) || defined(IN_GLIBCPP_V3)
#define RETURN_ON_ALLOCATION_FAILURE #define RETURN_ON_ALLOCATION_FAILURE
#endif #endif