OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* mangle.c (write_expression): Change ABI v6 to v5.
	(write_type): Likewise.

From-SVN: r170711
This commit is contained in:
Jason Merrill 2011-03-05 19:38:13 -05:00 committed by Jason Merrill
parent 5091c65687
commit 55af847f56
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/common.opt
View File

@ -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.

5
gcc/cp/ChangeLog
View File

@ -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

6
gcc/cp/mangle.c
View File

@ -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