===================================================================
@@ -9790,10 +9790,12 @@ avr_handle_addr_attribute (tree *node, t
bool io_p = (strncmp (IDENTIFIER_POINTER (name), "io", 2) == 0);
location_t loc = DECL_SOURCE_LOCATION (*node);
- if (TREE_CODE (*node) != VAR_DECL)
+ if (!VAR_P (*node))
{
- warning_at (loc, 0, "%qE attribute only applies to variables", name);
+ warning_at (loc, OPT_Wattributes, "%qE attribute only applies to "
+ "variables", name);
*no_add = true;
+ return NULL_TREE;
}
if (args != NULL_TREE)
@@ -9803,8 +9805,8 @@ avr_handle_addr_attribute (tree *node, t
tree arg = TREE_VALUE (args);
if (TREE_CODE (arg) != INTEGER_CST)
{
- warning (0, "%qE attribute allows only an integer constant argument",
- name);
+ warning_at (loc, OPT_Wattributes, "%qE attribute allows only an "
+ "integer constant argument", name);
*no_add = true;
}
else if (io_p
@@ -9813,19 +9815,20 @@ avr_handle_addr_attribute (tree *node, t
? low_io_address_operand : io_address_operand)
(GEN_INT (TREE_INT_CST_LOW (arg)), QImode)))
{
- warning_at (loc, 0, "%qE attribute address out of range", name);
+ warning_at (loc, OPT_Wattributes, "%qE attribute address "
+ "out of range", name);
*no_add = true;
}
else
{
tree attribs = DECL_ATTRIBUTES (*node);
- const char *names[] = { "io", "io_low", "address", NULL } ;
+ const char *names[] = { "io", "io_low", "address", NULL };
for (const char **p = names; *p; p++)
{
tree other = lookup_attribute (*p, attribs);
if (other && TREE_VALUE (other))
{
- warning_at (loc, 0,
+ warning_at (loc, OPT_Wattributes,
"both %s and %qE attribute provide address",
*p, name);
*no_add = true;
@@ -9836,7 +9839,8 @@ avr_handle_addr_attribute (tree *node, t
}
if (*no_add == false && io_p && !TREE_THIS_VOLATILE (*node))
- warning_at (loc, 0, "%qE attribute on non-volatile variable", name);
+ warning_at (loc, OPT_Wattributes, "%qE attribute on non-volatile variable",
+ name);
return NULL_TREE;
}
@@ -9886,11 +9890,11 @@ avr_attribute_table[] =
false },
{ "OS_main", 0, 0, false, true, true, avr_handle_fntype_attribute,
false },
- { "io", 0, 1, false, false, false, avr_handle_addr_attribute,
+ { "io", 0, 1, true, false, false, avr_handle_addr_attribute,
false },
- { "io_low", 0, 1, false, false, false, avr_handle_addr_attribute,
+ { "io_low", 0, 1, true, false, false, avr_handle_addr_attribute,
false },
- { "address", 1, 1, false, false, false, avr_handle_addr_attribute,
+ { "address", 1, 1, true, false, false, avr_handle_addr_attribute,
false },
{ "absdata", 0, 0, true, false, false, avr_handle_absdata_attribute,
false },