diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/i386/i386.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4eae15a..a7773a1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-04-06 Kai Tietz <kai.tietz@onevision.com> + + * config/i386/i386.c (ix86_handle_cconv_attribute): Ignore + calling convention attributes on METHOD_TYPEs for w64 ABI, too. + 2010-04-07 Sebastian Pop <sebastian.pop@amd.com> * tree-if-conv.c: Fix indentation and comments. diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index c945a54..5387fae 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); |