diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-05 10:20:17 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-05 10:20:17 +0000 |
| commit | 966a71d9f5ce6d70b2cb90a137f9ae9cc936ceac (patch) | |
| tree | 6e9573296550d259f594636263ba48331030ddc2 /gcc/c-family/c-common.c | |
| parent | 0d9d8091acb1893fa14499c7dc7352665e342ffb (diff) | |
| download | gcc-966a71d9f5ce6d70b2cb90a137f9ae9cc936ceac.tar.gz | |
2013-02-05 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 195751 using svnmerge.py
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@195753 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family/c-common.c')
| -rw-r--r-- | gcc/c-family/c-common.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index a50aae1e57a..1e6afaa77f2 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -6678,7 +6678,7 @@ handle_error_attribute (tree *node, tree name, tree args, int ARG_UNUSED (flags), bool *no_add_attrs) { if (TREE_CODE (*node) == FUNCTION_DECL - || TREE_CODE (TREE_VALUE (args)) == STRING_CST) + && TREE_CODE (TREE_VALUE (args)) == STRING_CST) /* Do nothing else, just set the attribute. We'll get at it later with lookup_attribute. */ ; @@ -8759,12 +8759,8 @@ handle_target_attribute (tree *node, tree name, tree args, int flags, warning (OPT_Wattributes, "%qE attribute ignored", name); *no_add_attrs = true; } - /* Do not strip invalid target attributes for targets which support function - multiversioning as the target string is used to determine versioned - functions. */ else if (! targetm.target_option.valid_attribute_p (*node, name, args, - flags) - && ! targetm.target_option.supports_function_versions ()) + flags)) *no_add_attrs = true; return NULL_TREE; |