From b97b26342e59fa18468f1ae629b245630675ab4a Mon Sep 17 00:00:00 2001
From: Kai Tietz <kai.tietz@onevision.com>
Date: Wed, 7 Apr 2010 08:04:59 +0000
Subject: [PATCH] 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
---
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 4eae15aecd3a..a7773a1d92b5 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 c945a540c6bd..5387fae6259c 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);
--
GitLab