* mangle.c (write_expression): Change ABI v6 to v5.

	(write_type): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170711 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/common.opt b/gcc/common.opt
index 2717b11..c2f2d6c 100644 (file)
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -739,13 +739,12 @@ Driver Undocumented
 ;    in template non-type arguments of pointer type.
 ;
 ; 4: The version of the ABI that introduces unambiguous mangling of
-;    vector types.
+;    vector types.  First selectable in G++ 4.5.
 ;
 ; 5: The version of the ABI that ignores attribute const/noreturn
-;    in function pointer mangling.
-;
-; 6: The version of the ABI that corrects mangling of decltype and
+;    in function pointer mangling, and corrects mangling of decltype and
 ;    function parameters used in other parameters and the return type.
+;    First selectable in G++ 4.6.
 ;
 ; Additional positive integers will be assigned as new versions of
 ; the ABI become the default version of the ABI.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dba9f10..f69e55b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-05  Jason Merrill  <jason@redhat.com>
+
+       * mangle.c (write_expression): Change ABI v6 to v5.
+       (write_type): Likewise.
+
 2011-03-04  Jan Hubicka  <jh@suse.cz>
 
        PR lto/47497

diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 1984094..0297a2a 100644 (file)
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -1934,8 +1934,8 @@ write_type (tree type)
              gcc_assert (!DECLTYPE_FOR_LAMBDA_CAPTURE (type)
                          && !DECLTYPE_FOR_LAMBDA_RETURN (type));
 
-             /* In ABI <6, we stripped decltype of a plain decl.  */
-             if (!abi_version_at_least (6)
+             /* In ABI <5, we stripped decltype of a plain decl.  */
+             if (!abi_version_at_least (5)
                  && DECLTYPE_TYPE_ID_EXPR_OR_MEMBER_ACCESS_P (type))
                {
                  tree expr = DECLTYPE_TYPE_EXPR (type);
@@ -2498,7 +2498,7 @@ write_expression (tree expr)
       write_char ('f');
       if (delta != 0)
        {
-         if (abi_version_at_least (6))
+         if (abi_version_at_least (5))
            {
              /* Let L be the number of function prototype scopes from the
                 innermost one (in which the parameter reference occurs) up