This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[Patch, avr] PR 18269 Fix build warning


This trivial patch fixes a build warning seen with older compilers
(shadowing of "link" global declaration) - see
https://www.sourceware.org/ml/binutils/2015-03/msg00465.html.

If it looks ok, could someone commit please? I don't have commit access.

(OT - kinda frustrating to keep asking someone to do it for me - what 
does it take to get write after approval access?)

Regards
Senthil

gas/ChangeLog

2015-04-17  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>

	* config/tc-avr.c (create_record_for_frag): Rename
	link to prop_rec_link.

diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c
index cc0328d..5c8982c 100644
--- a/gas/config/tc-avr.c
+++ b/gas/config/tc-avr.c
@@ -2060,41 +2060,41 @@ exclude_section_from_property_tables (segT sec)
 static struct avr_property_record_link *
 create_record_for_frag (segT sec, fragS *fragP)
 {
-  struct avr_property_record_link *link;
+  struct avr_property_record_link *prop_rec_link;
 
-  link = xmalloc (sizeof (struct avr_property_record_link));
-  memset (link, 0, sizeof (*link));
+  prop_rec_link = xmalloc (sizeof (struct avr_property_record_link));
+  memset (prop_rec_link, 0, sizeof (*prop_rec_link));
 
   if (fragP->tc_frag_data.is_org)
     {
-      link->record.offset = fragP->fr_next->fr_address;
-      link->record.section = sec;
+      prop_rec_link->record.offset = fragP->fr_next->fr_address;
+      prop_rec_link->record.section = sec;
 
       if (fragP->tc_frag_data.has_fill)
         {
-          link->record.data.org.fill = fragP->tc_frag_data.fill;
-          link->record.type = RECORD_ORG_AND_FILL;
+          prop_rec_link->record.data.org.fill = fragP->tc_frag_data.fill;
+          prop_rec_link->record.type = RECORD_ORG_AND_FILL;
         }
       else
-        link->record.type = RECORD_ORG;
+        prop_rec_link->record.type = RECORD_ORG;
     }
   else
     {
-      link->record.offset = fragP->fr_address;
-      link->record.section = sec;
+      prop_rec_link->record.offset = fragP->fr_address;
+      prop_rec_link->record.section = sec;
 
       gas_assert (fragP->tc_frag_data.is_align);
       if (fragP->tc_frag_data.has_fill)
         {
-          link->record.data.align.fill = fragP->tc_frag_data.fill;
-          link->record.type = RECORD_ALIGN_AND_FILL;
+          prop_rec_link->record.data.align.fill = fragP->tc_frag_data.fill;
+          prop_rec_link->record.type = RECORD_ALIGN_AND_FILL;
         }
       else
-        link->record.type = RECORD_ALIGN;
-      link->record.data.align.bytes = fragP->tc_frag_data.alignment;
+        prop_rec_link->record.type = RECORD_ALIGN;
+      prop_rec_link->record.data.align.bytes = fragP->tc_frag_data.alignment;
     }
 
-  return link;
+  return prop_rec_link;
 }
 
 /* Build a list of AVR_PROPERTY_RECORD_LINK structures for section SEC, and


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]