aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/mangle.c12
2 files changed, 16 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 84d991d..226c419 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-31 Diego Novillo <dnovillo@google.com>
+
+ * mangle.c (get_mangled_id): Factor from ...
+ (mangle_decl): ... here.
+ Call get_mangled_id.
+
2011-10-25 Gerald Pfeifer <gerald@pfeifer.com>
* NEWS (GCC 2.95): Refer to GNU/Linux instead of Linux.
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 8bc26d8..69fe147 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -3177,13 +3177,21 @@ mangle_decl_string (const tree decl)
return result;
}
+/* Return an identifier for the external mangled name of DECL. */
+
+static tree
+get_mangled_id (tree decl)
+{
+ tree id = mangle_decl_string (decl);
+ return targetm.mangle_decl_assembler_name (decl, id);
+}
+
/* Create an identifier for the external mangled name of DECL. */
void
mangle_decl (const tree decl)
{
- tree id = mangle_decl_string (decl);
- id = targetm.mangle_decl_assembler_name (decl, id);
+ tree id = get_mangled_id (decl);
SET_DECL_ASSEMBLER_NAME (decl, id);
if (G.need_abi_warning)