espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 00:59:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

* write.c: White space fixes.

Browse Source 
(fixup_segment): Move symbol_mri_common_p adjustments..
	(write_relocs): ..and symbol_equated_reloc_p adjustments..
	(adjust_reloc_syms): ..to here.
This commit is contained in:
Alan Modra
2007-02-17 07:20:56 +00:00
parent 3669427c8e
commit b4b24b7937
2 changed files with 31 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gas/ChangeLog
View File

@ -1,3 +1,10 @@
2007-02-17 Alan Modra <amodra@bigpond.net.au>
* write.c: White space fixes.
(fixup_segment): Move symbol_mri_common_p adjustments..
(write_relocs): ..and symbol_equated_reloc_p adjustments..
(adjust_reloc_syms): ..to here.
2007-02-16 Alan Modra <amodra@bigpond.net.au> 2007-02-16 Alan Modra <amodra@bigpond.net.au>
* subsegs.c (subseg_change, subseg_get): Use xcalloc rather than * subsegs.c (subseg_change, subseg_get): Use xcalloc rather than

57
gas/write.c
View File

@ -661,17 +661,21 @@ adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED,
/* If this symbol is equated to an undefined or common symbol, /* If this symbol is equated to an undefined or common symbol,
convert the fixup to being against that symbol. */ convert the fixup to being against that symbol. */
if (symbol_equated_reloc_p (sym) while (symbol_equated_reloc_p (sym)
|| S_IS_WEAKREFR (sym)) || S_IS_WEAKREFR (sym))
{ {
symbolS *newsym = symbol_get_value_expression (sym)->X_add_symbol;
if (sym == newsym)
break;
fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number;
sym = symbol_get_value_expression (sym)->X_add_symbol; fixp->fx_addsy = newsym;
fixp->fx_addsy = sym; sym = newsym;
} }
if (symbol_mri_common_p (sym)) if (symbol_mri_common_p (sym))
{ {
/* These symbols are handled specially in fixup_segment. */ fixp->fx_offset += S_GET_VALUE (sym);
fixp->fx_addsy = symbol_get_value_expression (sym)->X_add_symbol;
continue; continue;
} }
@ -808,15 +812,6 @@ fixup_segment (fixS *fixP, segT this_segment)
#endif #endif
add_number = fixP->fx_offset; add_number = fixP->fx_offset;
if (fixP->fx_addsy != NULL
&& symbol_mri_common_p (fixP->fx_addsy))
{
add_number += S_GET_VALUE (fixP->fx_addsy);
fixP->fx_offset = add_number;
fixP->fx_addsy
= symbol_get_value_expression (fixP->fx_addsy)->X_add_symbol;
}
if (fixP->fx_addsy != NULL) if (fixP->fx_addsy != NULL)
add_symbol_segment = S_GET_SEGMENT (fixP->fx_addsy); add_symbol_segment = S_GET_SEGMENT (fixP->fx_addsy);
@ -1030,24 +1025,6 @@ write_relocs (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED)
continue; continue;
} }
/* If this is an undefined symbol which was equated to another
symbol, then generate the reloc against the latter symbol
rather than the former. */
sym = fixp->fx_addsy;
while (symbol_equated_reloc_p (sym))
{
symbolS *n;
/* We must avoid looping, as that can occur with a badly
written program. */
n = symbol_get_value_expression (sym)->X_add_symbol;
if (n == sym)
break;
fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number;
sym = n;
}
fixp->fx_addsy = sym;
reloc = tc_gen_reloc (sec, fixp); reloc = tc_gen_reloc (sec, fixp);
if (!reloc) if (!reloc)
{ {
@ -1103,24 +1080,6 @@ write_relocs (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED)
continue; continue;
} }
/* If this is an undefined symbol which was equated to another
symbol, then generate the reloc against the latter symbol
rather than the former. */
sym = fixp->fx_addsy;
while (symbol_equated_reloc_p (sym))
{
symbolS *n;
/* We must avoid looping, as that can occur with a badly
written program. */
n = symbol_get_value_expression (sym)->X_add_symbol;
if (n == sym)
break;
fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number;
sym = n;
}
fixp->fx_addsy = sym;
reloc = tc_gen_reloc (sec, fixp); reloc = tc_gen_reloc (sec, fixp);
for (j = 0; reloc[j]; j++) for (j = 0; reloc[j]; j++)