PR target/44643

	* config/avr/avr.c (avr_insert_attributes): Leave TREE_READONLY
	alone. Error if non-const data has attribute progmem.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172415 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d8313a3..6ca6b28 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-14  Georg-Johann Lay  <avr@gjlay.de>
+
+       PR target/44643
+       * config/avr/avr.c (avr_insert_attributes): Leave TREE_READONLY
+       alone. Error if non-const data has attribute progmem.
+
 2011-04-13  Nathan Froyd  <froydnj@codesourcery.com>
 
        * tree.h (struct tree_constructor): Include tree_typed instead of

diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 56b216b..ca06431 100644 (file)
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -5149,14 +5149,20 @@ avr_insert_attributes (tree node, tree *attributes)
       && (TREE_STATIC (node) || DECL_EXTERNAL (node))
       && avr_progmem_p (node, *attributes))
     {
-      static const char dsec[] = ".progmem.data";
-      *attributes = tree_cons (get_identifier ("section"),
-               build_tree_list (NULL, build_string (strlen (dsec), dsec)),
-               *attributes);
-
-      /* ??? This seems sketchy.  Why can't the user declare the
-        thing const in the first place?  */
-      TREE_READONLY (node) = 1;
+      if (TREE_READONLY (node)) 
+        {
+          static const char dsec[] = ".progmem.data";
+
+          *attributes = tree_cons (get_identifier ("section"),
+                                   build_tree_list (NULL, build_string (strlen (dsec), dsec)),
+                                   *attributes);
+        }
+      else
+        {
+          error ("variable %q+D must be const in order to be put into"
+                 " read-only section by means of %<__attribute__((progmem))%>",
+                 node);
+        }
     }
 }