From 9a3865f966dc1e3daa62bf36a998bc646775da02 Mon Sep 17 00:00:00 2001 From: ktietz Date: Wed, 7 Apr 2010 08:04:59 +0000 Subject: [PATCH] 2010-04-06 Kai Tietz * config/i386/i386.c (ix86_handle_cconv_attribute): Ignore calling convention attributes on METHOD_TYPEs for w64 ABI, too. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158042 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/config/i386/i386.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4eae15aecd3..a7773a1d92b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-04-06 Kai Tietz + + * config/i386/i386.c (ix86_handle_cconv_attribute): Ignore + calling convention attributes on METHOD_TYPEs for w64 ABI, too. + 2010-04-07 Sebastian Pop * tree-if-conv.c: Fix indentation and comments. diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index c945a540c6b..5387fae6259 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -4447,7 +4447,8 @@ ix86_handle_cconv_attribute (tree *node, tree name, if (TARGET_64BIT) { /* Do not warn when emulating the MS ABI. */ - if (TREE_CODE (*node) != FUNCTION_TYPE + if ((TREE_CODE (*node) != FUNCTION_TYPE + && TREE_CODE (*node) != METHOD_TYPE) || ix86_function_type_abi (*node) != MS_ABI) warning (OPT_Wattributes, "%qE attribute ignored", name); -- 2.11.0