2005-04-20 H.J. Lu <hongjiu.lu@intel.com>

* config/obj-aout.h (S_IS_EXTERN): Removed.
	* config/obj-bout.h (S_IS_EXTERN): Likewise.
	* config/obj-coff.h (S_IS_EXTERN): Likewise.
	* symbols.c (S_IS_EXTERN): Likewise.
	* symbols.h (S_IS_EXTERN): Likewise.

	* config/tc-alpha.c (tc_gen_reloc): Replace S_IS_EXTERN with
	S_IS_EXTERNAL.
	* config/tc-d10v.c (md_apply_fix3): Likewise.
	* config/tc-ia64.c (ia64_fix_adjustable): Likewise.
	* config/tc-iq2000.c (iq2000_fix_adjustable): Likewise.
	* config/tc-m32r.c (m32r_fix_adjustable): Likewise.
	* config/tc-mmix.c (mmix_adjust_symtab): Likewise.
	* config/tc-sh64.c (shmedia_frob_file_before_adjust): Likewise.
	(shmedia_md_convert_frag): Likewise.
	* symbols.c (print_symbol_value_1): Likewise.
	* write.c (write_object_file): Likewise.
This commit is contained in:
H.J. Lu 2005-04-20 17:40:01 +00:00
parent 5f9084e9c2
commit e97b3f28e2
14 changed files with 31 additions and 26 deletions

View file

@ -1,3 +1,23 @@
2005-04-20 H.J. Lu <hongjiu.lu@intel.com>
* config/obj-aout.h (S_IS_EXTERN): Removed.
* config/obj-bout.h (S_IS_EXTERN): Likewise.
* config/obj-coff.h (S_IS_EXTERN): Likewise.
* symbols.c (S_IS_EXTERN): Likewise.
* symbols.h (S_IS_EXTERN): Likewise.
* config/tc-alpha.c (tc_gen_reloc): Replace S_IS_EXTERN with
S_IS_EXTERNAL.
* config/tc-d10v.c (md_apply_fix3): Likewise.
* config/tc-ia64.c (ia64_fix_adjustable): Likewise.
* config/tc-iq2000.c (iq2000_fix_adjustable): Likewise.
* config/tc-m32r.c (m32r_fix_adjustable): Likewise.
* config/tc-mmix.c (mmix_adjust_symtab): Likewise.
* config/tc-sh64.c (shmedia_frob_file_before_adjust): Likewise.
(shmedia_md_convert_frag): Likewise.
* symbols.c (print_symbol_value_1): Likewise.
* write.c (write_object_file): Likewise.
2005-04-20 Nick Clifton <nickc@redhat.com> 2005-04-20 Nick Clifton <nickc@redhat.com>
* config/tc-xtensa.c (get_aligned_diff): Change type of * config/tc-xtensa.c (get_aligned_diff): Change type of

View file

@ -127,8 +127,6 @@ extern void obj_aout_frob_file_before_fix (void);
|| (flag_strip_local_absolute \ || (flag_strip_local_absolute \
&& ! S_IS_EXTERNAL(s) \ && ! S_IS_EXTERNAL(s) \
&& S_GET_SEGMENT (s) == absolute_section)) && S_GET_SEGMENT (s) == absolute_section))
/* True if a symbol is not defined in this file. */
#define S_IS_EXTERN(s) ((s)->sy_symbol.n_type & N_EXT)
/* True if the symbol has been generated because of a .stabd directive. */ /* True if the symbol has been generated because of a .stabd directive. */
#define S_IS_STABD(s) (S_GET_NAME(s) == NULL) #define S_IS_STABD(s) (S_GET_NAME(s) == NULL)

View file

@ -197,8 +197,6 @@ struct relocation_info
|| (flag_strip_local_absolute \ || (flag_strip_local_absolute \
&& !S_IS_EXTERNAL(s) \ && !S_IS_EXTERNAL(s) \
&& S_GET_SEGMENT(s) == absolute_section)) && S_GET_SEGMENT(s) == absolute_section))
/* True if a symbol is not defined in this file. */
#define S_IS_EXTERN(s) ((s)->sy_symbol.n_type & N_EXT)
/* True if the symbol has been generated because of a .stabd directive. */ /* True if the symbol has been generated because of a .stabd directive. */
#define S_IS_STABD(s) (S_GET_NAME(s) == NULL) #define S_IS_STABD(s) (S_GET_NAME(s) == NULL)

View file

@ -502,10 +502,6 @@ typedef struct
&& !S_IS_EXTERNAL (s) \ && !S_IS_EXTERNAL (s) \
&& (s)->sy_symbol.ost_entry.n_scnum == C_ABS_SECTION)) && (s)->sy_symbol.ost_entry.n_scnum == C_ABS_SECTION))
/* True if a symbol is not defined in this file. */
#define S_IS_EXTERN(s) ((s)->sy_symbol.ost_entry.n_scnum == 0 \
&& S_GET_VALUE (s) == 0)
/* True if a symbol can be multiply defined (bss symbols have this def /* True if a symbol can be multiply defined (bss symbols have this def
though it is bad practice). */ though it is bad practice). */
#define S_IS_COMMON(s) ((s)->sy_symbol.ost_entry.n_scnum == 0 \ #define S_IS_COMMON(s) ((s)->sy_symbol.ost_entry.n_scnum == 0 \

View file

@ -5637,7 +5637,7 @@ tc_gen_reloc (asection *sec ATTRIBUTE_UNUSED,
symbol, the relocation will entirely be performed at link time, not symbol, the relocation will entirely be performed at link time, not
at assembly time. bfd_perform_reloc doesn't know about this sort at assembly time. bfd_perform_reloc doesn't know about this sort
of thing, and as a result we need to fake it out here. */ of thing, and as a result we need to fake it out here. */
if ((S_IS_EXTERN (fixp->fx_addsy) || S_IS_WEAK (fixp->fx_addsy) if ((S_IS_EXTERNAL (fixp->fx_addsy) || S_IS_WEAK (fixp->fx_addsy)
|| (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) || (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE)
|| (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_THREAD_LOCAL)) || (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_THREAD_LOCAL))
&& !S_IS_COMMON (fixp->fx_addsy)) && !S_IS_COMMON (fixp->fx_addsy))

View file

@ -1572,7 +1572,7 @@ md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
symbol, then ignore the offset. symbol, then ignore the offset.
XXX - Do we have to worry about branches to a symbol + offset ? */ XXX - Do we have to worry about branches to a symbol + offset ? */
if (fixP->fx_addsy != NULL if (fixP->fx_addsy != NULL
&& S_IS_EXTERN (fixP->fx_addsy) ) && S_IS_EXTERNAL (fixP->fx_addsy) )
{ {
segT fseg = S_GET_SEGMENT (fixP->fx_addsy); segT fseg = S_GET_SEGMENT (fixP->fx_addsy);
segment_info_type *segf = seg_info(fseg); segment_info_type *segf = seg_info(fseg);

View file

@ -10844,7 +10844,7 @@ ia64_fix_adjustable (fix)
fixS *fix; fixS *fix;
{ {
/* Prevent all adjustments to global symbols */ /* Prevent all adjustments to global symbols */
if (S_IS_EXTERN (fix->fx_addsy) || S_IS_WEAK (fix->fx_addsy)) if (S_IS_EXTERNAL (fix->fx_addsy) || S_IS_WEAK (fix->fx_addsy))
return 0; return 0;
switch (fix->fx_r_type) switch (fix->fx_r_type)

View file

@ -800,7 +800,7 @@ iq2000_fix_adjustable (fixS * fixP)
return TRUE; return TRUE;
/* Prevent all adjustments to global symbols. */ /* Prevent all adjustments to global symbols. */
if (S_IS_EXTERN (fixP->fx_addsy)) if (S_IS_EXTERNAL (fixP->fx_addsy))
return FALSE; return FALSE;
if (S_IS_WEAK (fixP->fx_addsy)) if (S_IS_WEAK (fixP->fx_addsy))

View file

@ -2205,7 +2205,7 @@ m32r_fix_adjustable (fixS *fixP)
return 1; return 1;
/* Prevent all adjustments to global symbols. */ /* Prevent all adjustments to global symbols. */
if (S_IS_EXTERN (fixP->fx_addsy)) if (S_IS_EXTERNAL (fixP->fx_addsy))
return 0; return 0;
if (S_IS_WEAK (fixP->fx_addsy)) if (S_IS_WEAK (fixP->fx_addsy))
return 0; return 0;

View file

@ -3309,7 +3309,7 @@ mmix_adjust_symtab (void)
{ {
if (sym == regsec) if (sym == regsec)
{ {
if (S_IS_EXTERN (sym) || symbol_used_in_reloc_p (sym)) if (S_IS_EXTERNAL (sym) || symbol_used_in_reloc_p (sym))
abort (); abort ();
symbol_remove (sym, &symbol_rootP, &symbol_lastP); symbol_remove (sym, &symbol_rootP, &symbol_lastP);
} }

View file

@ -284,7 +284,7 @@ shmedia_frob_file_before_adjust (void)
if (mainsym != NULL if (mainsym != NULL
&& S_GET_OTHER (mainsym) != STO_SH5_ISA32 && S_GET_OTHER (mainsym) != STO_SH5_ISA32
&& (S_IS_EXTERN (mainsym) || S_IS_WEAK (mainsym))) && (S_IS_EXTERNAL (mainsym) || S_IS_WEAK (mainsym)))
{ {
symp->sy_value.X_op = O_symbol; symp->sy_value.X_op = O_symbol;
symp->sy_value.X_add_symbol = mainsym; symp->sy_value.X_add_symbol = mainsym;
@ -823,7 +823,7 @@ shmedia_md_convert_frag (bfd *output_bfd ATTRIBUTE_UNUSED,
|| sh_relax || sh_relax
|| symbolP == NULL || symbolP == NULL
|| ! S_IS_DEFINED (symbolP) || ! S_IS_DEFINED (symbolP)
|| S_IS_EXTERN (symbolP) || S_IS_EXTERNAL (symbolP)
|| S_IS_WEAK (symbolP) || S_IS_WEAK (symbolP)
|| (S_GET_SEGMENT (fragP->fr_symbol) != absolute_section || (S_GET_SEGMENT (fragP->fr_symbol) != absolute_section
&& S_GET_SEGMENT (fragP->fr_symbol) != seg)); && S_GET_SEGMENT (fragP->fr_symbol) != seg));

View file

@ -1822,12 +1822,6 @@ S_IS_LOCAL (symbolS *s)
&& name[1] == '?'))))); && name[1] == '?')))));
} }
int
S_IS_EXTERN (symbolS *s)
{
return S_IS_EXTERNAL (s);
}
int int
S_IS_STABD (symbolS *s) S_IS_STABD (symbolS *s)
{ {
@ -2405,7 +2399,7 @@ print_symbol_value_1 (FILE *file, symbolS *sym)
fprintf (file, " used"); fprintf (file, " used");
if (S_IS_LOCAL (sym)) if (S_IS_LOCAL (sym))
fprintf (file, " local"); fprintf (file, " local");
if (S_IS_EXTERN (sym)) if (S_IS_EXTERNAL (sym))
fprintf (file, " extern"); fprintf (file, " extern");
if (S_IS_DEBUG (sym)) if (S_IS_DEBUG (sym))
fprintf (file, " debug"); fprintf (file, " debug");

View file

@ -98,7 +98,6 @@ extern int S_IS_DEFINED (symbolS *);
extern int S_FORCE_RELOC (symbolS *, int); extern int S_FORCE_RELOC (symbolS *, int);
extern int S_IS_DEBUG (symbolS *); extern int S_IS_DEBUG (symbolS *);
extern int S_IS_LOCAL (symbolS *); extern int S_IS_LOCAL (symbolS *);
extern int S_IS_EXTERN (symbolS *);
extern int S_IS_STABD (symbolS *); extern int S_IS_STABD (symbolS *);
extern const char *S_GET_NAME (symbolS *); extern const char *S_GET_NAME (symbolS *);
extern segT S_GET_SEGMENT (symbolS *); extern segT S_GET_SEGMENT (symbolS *);

View file

@ -1956,10 +1956,10 @@ write_object_file (void)
if (symp == abs_section_sym if (symp == abs_section_sym
|| (! EMIT_SECTION_SYMBOLS || (! EMIT_SECTION_SYMBOLS
&& symbol_section_p (symp)) && symbol_section_p (symp))
/* Note that S_IS_EXTERN and S_IS_LOCAL are not always /* Note that S_IS_EXTERNAL and S_IS_LOCAL are not always
opposites. Sometimes the former checks flags and the opposites. Sometimes the former checks flags and the
latter examines the name... */ latter examines the name... */
|| (!S_IS_EXTERN (symp) || (!S_IS_EXTERNAL (symp)
&& (punt || S_IS_LOCAL (symp)) && (punt || S_IS_LOCAL (symp))
&& ! symbol_used_in_reloc_p (symp))) && ! symbol_used_in_reloc_p (symp)))
{ {