re PR target/78093 ([avr] New variable attribute "absdata" and option "-mabsdata...

	PR target/78093
	* config/avr/avr.c (avr_decl_maybe_lds_p): New static function.
	(avr_encode_section_info) [TARGET_ABSDATA && AVR_TINY]: Use it.

From-SVN: r242660

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bcad2c5ff54e8b437b5015a98c075542fc0a4bf6..0e9376211c0c743b155f64a52b4d38b63dabb683 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-21  Georg-Johann Lay  <avr@gjlay.de>
+
+       PR target/78093
+       * config/avr/avr.c (avr_decl_maybe_lds_p): New static function.
+       (avr_encode_section_info) [TARGET_ABSDATA && AVR_TINY]: Use it.
+
 2016-11-21  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
        * rtl.h: Adjust prototype.

diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index caa9af05faed80f0365c273d52501c0cedd25165..e527a504a03933826d61f643fa4fa38ab0f6b333 100644 (file)
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -10102,6 +10102,38 @@ avr_section_type_flags (tree decl, const char *name, int reloc)
 }
 
 
+/* A helper for the next function.  NODE is a decl that is associated with
+   a symbol.  Return TRUE if the respective object may be accessed by LDS.
+   There might still be other reasons for why LDS is not appropriate.
+   This function is only appropriate for AVR_TINY.  */
+
+static bool
+avr_decl_maybe_lds_p (tree node)
+{
+  if (!node
+      || TREE_CODE (node) != VAR_DECL
+      || DECL_SECTION_NAME (node) != NULL)
+    return false;
+
+  /* Don't use LDS for objects that go to .rodata.  The current default
+     linker description file still locates .rodata in RAM, but this is not
+     a must.  A better linker script would just keep .rodata in flash and
+     add an offset of 0x4000 to the VMA.  Hence avoid LDS for such data.  */
+
+  if (TREE_READONLY (node))
+    return false;
+
+  // C++ requires peeling arrays.
+
+  do
+    node = TREE_TYPE (node);
+  while (ARRAY_TYPE == TREE_CODE (node));
+
+  return (node != error_mark_node
+          && !TYPE_READONLY (node));
+}
+
+
 /* Implement `TARGET_ENCODE_SECTION_INFO'.  */
 
 static void
@@ -10193,7 +10225,8 @@ avr_encode_section_info (tree decl, rtx rtl, int new_decl_p)
       if (avr_decl_absdata_p (decl, DECL_ATTRIBUTES (decl))
           || (TARGET_ABSDATA
               && !progmem_p
-              && !addr_attr)
+              && !addr_attr
+              && avr_decl_maybe_lds_p (decl))
           || (addr_attr
               // If addr_attr is non-null, it has an argument.  Peek into it.
               && TREE_INT_CST_LOW (TREE_VALUE (TREE_VALUE (addr_attr))) < 0xc0))