Backport fix for PR 65210

gcc/ChangeLog

2016-09-27  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>

	Backport from trunk r227496

	PR target/65210
	* config/avr/avr.c (avr_eval_addr_attrib): Look for io_low
	attribute as well.

gcc/testsuite/ChangeLog

2016-09-27  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>

	Backport from trunk r227496

	PR target/65210
	* gcc.target/avr/pr65210.c: New test.

From-SVN: r240521

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ca81139c8f2f671e2845eb4824606800bfb265b5..6ba0ee89947f73994344de0d6e9467074982eff3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2016-09-27  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
+
+       Backport from trunk r227496
+
+       PR target/65210
+       * config/avr/avr.c (avr_eval_addr_attrib): Look for io_low
+       attribute as well.
+
 2016-09-22  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
 
        Backport from 2016-09-22 trunk r240388.

diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index c6413421c5e2c117fadaa2b7f2b2b313d8a270f5..4ffb38c571f5572ebc518598390e420600f27aed 100644 (file)
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -9122,6 +9122,8 @@ avr_eval_addr_attrib (rtx x)
       if (SYMBOL_REF_FLAGS (x) & SYMBOL_FLAG_IO)
        {
          attr = lookup_attribute ("io", DECL_ATTRIBUTES (decl));
+         if (!attr || !TREE_VALUE (attr))
+           attr = lookup_attribute ("io_low", DECL_ATTRIBUTES (decl));
          gcc_assert (attr);
        }
       if (!attr || !TREE_VALUE (attr))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ec3864f6f2c17000a04d680b457999bf57f856f8..a84b42d85d1b9392c19f64b6ec4268c275eb7bcf 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2016-09-27  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
+
+       Backport from trunk r227496
+
+       PR target/65210
+       * gcc.target/avr/pr65210.c: New test.
+
 2016-09-21  Uros Bizjak  <ubizjak@gmail.com>
 
        * gcc.c-torture/unsorted/dump-noaddr.x: Remove debug statements.

diff --git a/gcc/testsuite/gcc.target/avr/pr65210.c b/gcc/testsuite/gcc.target/avr/pr65210.c
new file mode 100644 (file)
index 0000000..1aed441
--- /dev/null
+++ b/gcc/testsuite/gcc.target/avr/pr65210.c
@@ -0,0 +1,7 @@
+/* { dg-do compile } */
+
+/* This testcase exposes PR65210. Usage of the io_low attribute
+   causes assertion failure because code only looks for the io
+   attribute if SYMBOL_FLAG_IO is set. */
+
+volatile char q __attribute__((io_low,address(0x81)));