* config/obj-coff.c (obj_frob_symbol): Don't merge

labels. Don't merge if the symbol isn't constant. Return
immediately if a symbol is merged.
This commit is contained in:
DJ Delorie 2000-07-24 17:50:35 +00:00
parent 3eb6f68f1b
commit 39da812840
2 changed files with 9 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2000-07-24 Mark Elbrecht <snowball3@bigfoot.com>
* config/obj-coff.c (obj_frob_symbol): Don't merge
labels. Don't merge if the symbol isn't constant. Return
immediately if a symbol is merged.
2000-07-22 Alan Modra <alan@linuxcare.com.au>
* frags.c (frag_align): Correct absolute section alignment.

View File

@ -1139,11 +1139,14 @@ coff_frob_symbol (symp, punt)
symbolS *real;
if (!SF_GET_LOCAL (symp)
&& !SF_GET_STATICS (symp)
&& S_GET_STORAGE_CLASS (symp) != C_LABEL
&& symbol_constant_p(symp)
&& (real = symbol_find_base (S_GET_NAME (symp), DO_NOT_STRIP))
&& real != symp)
{
c_symbol_merge (symp, real);
*punt = 1;
return;
}
if (!S_IS_DEFINED (symp) && !SF_GET_LOCAL (symp))
{