aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorKai Tietz <kai.tietz@onevision.com>2010-04-07 08:04:59 +0000
committerKai Tietz <ktietz@gcc.gnu.org>2010-04-07 10:04:59 +0200
commitb97b26342e59fa18468f1ae629b245630675ab4a (patch)
tree929f6135eadf9a739e6b96faea708a245bfe0824 /gcc
parent62ef243189943eeec4e8e51c0252006589a486e5 (diff)
downloadgcc-b97b26342e59fa18468f1ae629b245630675ab4a.zip
gcc-b97b26342e59fa18468f1ae629b245630675ab4a.tar.gz
gcc-b97b26342e59fa18468f1ae629b245630675ab4a.tar.bz2
i386.c (ix86_handle_cconv_attribute): Ignore calling convention attributes on METHOD_TYPEs for w64 ABI, too.
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. From-SVN: r158042
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/i386/i386.c3
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);