projects
/
platform
/
upstream
/
binutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
packaging: support aarch64 build
[platform/upstream/binutils.git]
/
gdb
/
gnu-v2-abi.c
diff --git
a/gdb/gnu-v2-abi.c
b/gdb/gnu-v2-abi.c
index
e635e8f
..
2929b89
100644
(file)
--- a/
gdb/gnu-v2-abi.c
+++ b/
gdb/gnu-v2-abi.c
@@
-1,7
+1,6
@@
/* Abstraction of GNU v2 abi.
/* Abstraction of GNU v2 abi.
- Copyright (C) 2001-2003, 2005, 2007-2012 Free Software Foundation,
- Inc.
+ Copyright (C) 2001-2014 Free Software Foundation, Inc.
Contributed by Daniel Berlin <dberlin@redhat.com>
Contributed by Daniel Berlin <dberlin@redhat.com>
@@
-21,7
+20,6
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-#include "gdb_string.h"
#include "symtab.h"
#include "gdbtypes.h"
#include "value.h"
#include "symtab.h"
#include "gdbtypes.h"
#include "value.h"
@@
-29,8
+27,6
@@
#include "gdb-demangle.h"
#include "cp-abi.h"
#include "cp-support.h"
#include "gdb-demangle.h"
#include "cp-abi.h"
#include "cp-support.h"
-#include "exceptions.h"
-
#include <ctype.h>
struct cp_abi_ops gnu_v2_abi_ops;
#include <ctype.h>
struct cp_abi_ops gnu_v2_abi_ops;
@@
-192,7
+188,7
@@
gnuv2_value_rtti_type (struct value *v, int *full, int *top, int *using_enc)
struct type *known_type;
struct type *rtti_type;
CORE_ADDR vtbl;
struct type *known_type;
struct type *rtti_type;
CORE_ADDR vtbl;
- struct
minimal_symbol *
minsym;
+ struct
bound_minimal_symbol
minsym;
char *demangled_name, *p;
const char *linkage_name;
struct type *btype;
char *demangled_name, *p;
const char *linkage_name;
struct type *btype;
@@
-246,13
+242,13
@@
gnuv2_value_rtti_type (struct value *v, int *full, int *top, int *using_enc)
/* Try to find a symbol that is the vtable. */
minsym=lookup_minimal_symbol_by_pc(vtbl);
/* Try to find a symbol that is the vtable. */
minsym=lookup_minimal_symbol_by_pc(vtbl);
- if (minsym==NULL
- || (linkage_name=
SYMBOL_LINKAGE_NAME (
minsym))==NULL
+ if (minsym
.minsym
==NULL
+ || (linkage_name=
MSYMBOL_LINKAGE_NAME (minsym.
minsym))==NULL
|| !is_vtable_name (linkage_name))
return NULL;
/* If we just skip the prefix, we get screwed by namespaces. */
|| !is_vtable_name (linkage_name))
return NULL;
/* If we just skip the prefix, we get screwed by namespaces. */
- demangled_name=
cplus
_demangle(linkage_name,DMGL_PARAMS|DMGL_ANSI);
+ demangled_name=
gdb
_demangle(linkage_name,DMGL_PARAMS|DMGL_ANSI);
p = strchr (demangled_name, ' ');
if (p)
*p = '\0';
p = strchr (demangled_name, ' ');
if (p)
*p = '\0';
@@
-424,5
+420,4
@@
_initialize_gnu_v2_abi (void)
{
init_gnuv2_ops ();
register_cp_abi (&gnu_v2_abi_ops);
{
init_gnuv2_ops ();
register_cp_abi (&gnu_v2_abi_ops);
- set_cp_abi_as_auto_default (gnu_v2_abi_ops.shortname);
}
}