diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5160b3c9290..a5517a9eae7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-02  Mark Mitchell  <mark@codesourcery.com>
 
+	* mangle.c (canonicalize_for_substitution): Return the canonical
+	variant of a type.
+
 	* decl.c (duplicate_decls): Preserve DECL_ORIGINAL_TYPE for a
 	TYPE_DECL.
 	* typeck.c (commonparms): Remove obstack manipulations.
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 594e25c5a71..23e1eb9b8ef 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -274,6 +274,8 @@ canonicalize_for_substitution (node)
   /* For a TYPE_DECL, use the type instead.  */
   if (TREE_CODE (node) == TYPE_DECL)
     node = TREE_TYPE (node);
+  if (TYPE_P (node))
+    node = canonical_type_variant (node);
 
   return node;
 }