Skip to content

Commit 96d56e9

Browse files
nickcliftonnickclifton
committed
* bfd/coff-arm.c (coff_arm_relocate_section)
 (record_thumb_to_arm_glue, bfd_arm_process_before_allocation): Change member name class to symbol_class. * bfd/coff-i960.c (coff_i960_relocate_section) Rename variable class to class_val. Change member name class to symbol_class. * bfd/coff-rs6000.c (_bfd_xcoff_swap_aux_in) (_bfd_xcoff_swap_aux_out): Rename arguments class to in_class. * bfd/coff-stgo32.c (adjust_aux_in_post) (adjust_aux_out_pre, adjust_aux_out_post): Rename arguments class to in_class. * bfd/coff64-rs6000.c (_bfd_xcoff64_swap_aux_in) (_bfd_xcoff64_swap_aux_out): Rename arguments class to in_class. * bfd/coffcode.h (coff_pointerize_aux_hook): Rename variable class to n_sclass. * bfd/coffgen.c (coff_write_symbol, coff_pointerize_aux): Rename variables named class to n_sclass. (coff_write_symbols): Rename variable class to sym_class. (bfd_coff_set_symbol_class): Rename argument class to symbol_class. * bfd/cofflink.c (_bfd_coff_link_hash_newfunc) (coff_link_add_symbols, _bfd_coff_link_input_bfd) (_bfd_coff_write_global_sym, _bfd_coff_generic_relocate_section): Update code to use renamed members. * bfd/coffswap.h (coff_swap_aux_in, coff_swap_aux_out): Rename argument class to in_class. * bfd/libcoff-in.h (struct coff_link_hash_entry, struct coff_debug_merge_type) Renamed members class to symbol_class and type_class. * bfd/libcoff.h Regenerated. * bfd/peXXigen.c: (_bfd_XXi_swap_aux_in, _bfd_XXi_swap_aux_out): Rename argument class to in_class. * bfd/pef.c (bfd_pef_parse_imported_symbol): Update code to use renamed members. * bfd/pef.h (struct bfd_pef_imported_symbol): Changed name of member class to symbol_class. * binutils/ieee.c (ieee_read_cxx_misc, ieee_read_cxx_class) (ieee_read_reference): Rename variables named class to cxxclass. * gas/config/tc-arc.c (struct syntax_classes): Rename member class to s_class. (arc_extinst): Rename variable class to s_class. Update code to use renamed members. * gas/config/tc-mips.c (insn_uses_reg): Rename argument class to regclass. * gas/config/tc-ppc.c (ppc_csect, ppc_change_csect, ppc_function) (ppc_tc, ppc_is_toc_sym, ppc_symbol_new_hook, ppc_frob_label) (ppc_fix_adjustable, md_apply_fix): Update code to use renamed members. * gas/config/tc-ppc.h (struct ppc_tc_sy): Change name of member from class to symbol_class. (OBJ_COPY_SYMBOL_ATTRIBUTES): Update code to use renamed members. * gas/config/tc-score.c (s3_adjust_paritybit): Rename argument class to i_class. * gas/config/tc-score7.c (s7_adjust_paritybit): Rename argument class to i_class. * gprof/corefile.c (core_create_function_syms): Rename variable class to cxxclass. * include/coff/ti.h (GET_LNSZ_SIZE, PUT_LNSZ_SIZE): Updated name of class variable to in_class to match changes in function that use this macro. * include/opcode/ia64.h (struct ia64_operand): Renamed member class to op_class * ld/emultempl/elf32.em (gld${EMULATION_NAME}_load_symbols) (gld${EMULATION_NAME}_try_needed): Rename variable class to link_class * opcodes/ia64-dis.c (print_insn_ia64): Update code to use renamed member. * opcodes/m88k-dis.c (m88kdis): Rename variable class to in_class. * opcodes/tic80-opc.c (tic80_symbol_to_value) (tic80_value_to_symbol): Rename argument class to symbol_class.
1 parent 4db61d3 commit 96d56e9

36 files changed

Lines changed: 292 additions & 192 deletions

‎bfd/ChangeLog‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
1+
2009-09-05 Martin Thuresson <martin@mtme.org>
2+
3+
* coff-arm.c (coff_arm_relocate_section)
4+
(record_thumb_to_arm_glue, bfd_arm_process_before_allocation):
5+
Change member name class to symbol_class.
6+
* coff-i960.c (coff_i960_relocate_section) Rename variable
7+
class to class_val. Change member name class to symbol_class.
8+
* coff-rs6000.c (_bfd_xcoff_swap_aux_in)
9+
(_bfd_xcoff_swap_aux_out): Rename arguments class to in_class.
10+
* coff-stgo32.c (adjust_aux_in_post)
11+
(adjust_aux_out_pre, adjust_aux_out_post): Rename arguments class
12+
to in_class.
13+
* coff64-rs6000.c (_bfd_xcoff64_swap_aux_in)
14+
(_bfd_xcoff64_swap_aux_out): Rename arguments class to in_class.
15+
* coffcode.h (coff_pointerize_aux_hook): Rename variable class
16+
to n_sclass.
17+
* coffgen.c (coff_write_symbol, coff_pointerize_aux): Rename
18+
variables named class to n_sclass. (coff_write_symbols): Rename
19+
variable class to sym_class. (bfd_coff_set_symbol_class): Rename
20+
argument class to symbol_class.
21+
* cofflink.c (_bfd_coff_link_hash_newfunc)
22+
(coff_link_add_symbols, _bfd_coff_link_input_bfd)
23+
(_bfd_coff_write_global_sym, _bfd_coff_generic_relocate_section):
24+
Update code to use renamed members.
25+
* coffswap.h (coff_swap_aux_in, coff_swap_aux_out): Rename
26+
argument class to in_class.
27+
* libcoff-in.h (struct coff_link_hash_entry, struct
28+
coff_debug_merge_type) Renamed members class to symbol_class and
29+
type_class.
30+
* libcoff.h Regenerated.
31+
* peXXigen.c: (_bfd_XXi_swap_aux_in, _bfd_XXi_swap_aux_out):
32+
Rename argument class to in_class.
33+
* pef.c (bfd_pef_parse_imported_symbol): Update code to use
34+
renamed members.
35+
* pef.h (struct bfd_pef_imported_symbol): Changed name of
36+
member class to symbol_class.
37+
138
2009-09-04 H.J. Lu <hongjiu.lu@intel.com>
239

340
* configure: Regenerated.

‎bfd/coff-arm.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,8 +1332,8 @@ coff_arm_relocate_section (bfd *output_bfd,
13321332

13331333
if (howto->type == ARM_26)
13341334
{
1335-
if ( h->class == C_THUMBSTATFUNC
1336-
|| h->class == C_THUMBEXTFUNC)
1335+
if ( h->symbol_class == C_THUMBSTATFUNC
1336+
|| h->symbol_class == C_THUMBEXTFUNC)
13371337
{
13381338
/* Arm code calling a Thumb function. */
13391339
unsigned long int tmp;
@@ -1419,9 +1419,9 @@ coff_arm_relocate_section (bfd *output_bfd,
14191419
/* Note: We used to check for ARM_THUMB9 and ARM_THUMB12. */
14201420
else if (howto->type == ARM_THUMB23)
14211421
{
1422-
if ( h->class == C_EXT
1423-
|| h->class == C_STAT
1424-
|| h->class == C_LABEL)
1422+
if ( h->symbol_class == C_EXT
1423+
|| h->symbol_class == C_STAT
1424+
|| h->symbol_class == C_LABEL)
14251425
{
14261426
/* Thumb code calling an ARM function. */
14271427
asection * s = 0;
@@ -1721,8 +1721,8 @@ coff_arm_relocate_section (bfd *output_bfd,
17211721
int patchit = FALSE;
17221722

17231723
if (h != NULL
1724-
&& ( h->class == C_THUMBSTATFUNC
1725-
|| h->class == C_THUMBEXTFUNC))
1724+
&& ( h->symbol_class == C_THUMBSTATFUNC
1725+
|| h->symbol_class == C_THUMBEXTFUNC))
17261726
{
17271727
patchit = TRUE;
17281728
}
@@ -1932,7 +1932,7 @@ record_thumb_to_arm_glue (struct bfd_link_info * info,
19321932

19331933
/* If we mark it 'thumb', the disassembler will do a better job. */
19341934
myh = (struct coff_link_hash_entry *) bh;
1935-
myh->class = C_THUMBEXTFUNC;
1935+
myh->symbol_class = C_THUMBEXTFUNC;
19361936

19371937
free (tmp_name);
19381938

@@ -2096,7 +2096,7 @@ bfd_arm_process_before_allocation (bfd * abfd,
20962096
the target of the call. If it is a thumb target, we
20972097
insert glue. */
20982098

2099-
if (h->class == C_THUMBEXTFUNC)
2099+
if (h->symbol_class == C_THUMBEXTFUNC)
21002100
record_arm_to_thumb_glue (info, h);
21012101
break;
21022102

@@ -2110,7 +2110,7 @@ bfd_arm_process_before_allocation (bfd * abfd,
21102110
for it. This is not really a problem, since the link
21112111
is doomed anyway. */
21122112

2113-
switch (h->class)
2113+
switch (h->symbol_class)
21142114
{
21152115
case C_EXT:
21162116
case C_STAT:

‎bfd/coff-i960.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -488,14 +488,14 @@ coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
488488

489489
if (howto->type == R_OPTCALL && ! info->relocatable && symndx != -1)
490490
{
491-
int class;
491+
int class_val;
492492

493493
if (h != NULL)
494-
class = h->class;
494+
class_val = h->symbol_class;
495495
else
496-
class = sym->n_sclass;
496+
class_val = sym->n_sclass;
497497

498-
switch (class)
498+
switch (class_val)
499499
{
500500
case C_NULL:
501501
/* This symbol is apparently not from a COFF input file.

‎bfd/coff-rs6000.c‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -495,19 +495,19 @@ _bfd_xcoff_swap_sym_out (abfd, inp, extp)
495495
}
496496

497497
void
498-
_bfd_xcoff_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
498+
_bfd_xcoff_swap_aux_in (abfd, ext1, type, in_class, indx, numaux, in1)
499499
bfd *abfd;
500500
PTR ext1;
501501
int type;
502-
int class;
502+
int in_class;
503503
int indx;
504504
int numaux;
505505
PTR in1;
506506
{
507507
AUXENT * ext = (AUXENT *)ext1;
508508
union internal_auxent *in = (union internal_auxent *)in1;
509509

510-
switch (class)
510+
switch (in_class)
511511
{
512512
case C_FILE:
513513
if (ext->x_file.x_fname[0] == 0)
@@ -573,7 +573,8 @@ _bfd_xcoff_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
573573
in->x_sym.x_tagndx.l = H_GET_32 (abfd, ext->x_sym.x_tagndx);
574574
in->x_sym.x_tvndx = H_GET_16 (abfd, ext->x_sym.x_tvndx);
575575

576-
if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
576+
if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
577+
|| ISTAG (in_class))
577578
{
578579
in->x_sym.x_fcnary.x_fcn.x_lnnoptr =
579580
H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);
@@ -614,11 +615,11 @@ unsigned int _bfd_xcoff_swap_aux_out
614615
PARAMS ((bfd *, PTR, int, int, int, int, PTR));
615616

616617
unsigned int
617-
_bfd_xcoff_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
618+
_bfd_xcoff_swap_aux_out (abfd, inp, type, in_class, indx, numaux, extp)
618619
bfd * abfd;
619620
PTR inp;
620621
int type;
621-
int class;
622+
int in_class;
622623
int indx ATTRIBUTE_UNUSED;
623624
int numaux ATTRIBUTE_UNUSED;
624625
PTR extp;
@@ -627,7 +628,7 @@ _bfd_xcoff_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
627628
AUXENT *ext = (AUXENT *)extp;
628629

629630
memset ((PTR)ext, 0, bfd_coff_auxesz (abfd));
630-
switch (class)
631+
switch (in_class)
631632
{
632633
case C_FILE:
633634
if (in->x_file.x_fname[0] == 0)
@@ -677,7 +678,8 @@ _bfd_xcoff_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
677678
H_PUT_32 (abfd, in->x_sym.x_tagndx.l, ext->x_sym.x_tagndx);
678679
H_PUT_16 (abfd, in->x_sym.x_tvndx, ext->x_sym.x_tvndx);
679680

680-
if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
681+
if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
682+
|| ISTAG (in_class))
681683
{
682684
H_PUT_32 (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr,
683685
ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);

‎bfd/coff-stgo32.c‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,54 +218,57 @@ adjust_scnhdr_out_post (abfd, in, out)
218218
}
219219

220220
static void
221-
adjust_aux_in_post (abfd, ext1, type, class, indx, numaux, in1)
221+
adjust_aux_in_post (abfd, ext1, type, in_class, indx, numaux, in1)
222222
bfd *abfd ATTRIBUTE_UNUSED;
223223
PTR ext1 ATTRIBUTE_UNUSED;
224224
int type;
225-
int class;
225+
int in_class;
226226
int indx ATTRIBUTE_UNUSED;
227227
int numaux ATTRIBUTE_UNUSED;
228228
PTR in1;
229229
{
230230
union internal_auxent *in = (union internal_auxent *) in1;
231231

232-
if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
232+
if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
233+
|| ISTAG (in_class))
233234
{
234235
ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, GO32_STUBSIZE);
235236
}
236237
}
237238

238239
static void
239-
adjust_aux_out_pre (abfd, inp, type, class, indx, numaux, extp)
240+
adjust_aux_out_pre (abfd, inp, type, in_class, indx, numaux, extp)
240241
bfd *abfd ATTRIBUTE_UNUSED;
241242
PTR inp;
242243
int type;
243-
int class;
244+
int in_class;
244245
int indx ATTRIBUTE_UNUSED;
245246
int numaux ATTRIBUTE_UNUSED;
246247
PTR extp ATTRIBUTE_UNUSED;
247248
{
248249
union internal_auxent *in = (union internal_auxent *) inp;
249250

250-
if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
251+
if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
252+
|| ISTAG (in_class))
251253
{
252254
ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, -GO32_STUBSIZE);
253255
}
254256
}
255257

256258
static void
257-
adjust_aux_out_post (abfd, inp, type, class, indx, numaux, extp)
259+
adjust_aux_out_post (abfd, inp, type, in_class, indx, numaux, extp)
258260
bfd *abfd ATTRIBUTE_UNUSED;
259261
PTR inp;
260262
int type;
261-
int class;
263+
int in_class;
262264
int indx ATTRIBUTE_UNUSED;
263265
int numaux ATTRIBUTE_UNUSED;
264266
PTR extp ATTRIBUTE_UNUSED;
265267
{
266268
union internal_auxent *in = (union internal_auxent *) inp;
267269

268-
if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
270+
if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
271+
|| ISTAG (in_class))
269272
{
270273
ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, GO32_STUBSIZE);
271274
}

‎bfd/coff64-rs6000.c‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -353,19 +353,19 @@ _bfd_xcoff64_swap_sym_out (abfd, inp, extp)
353353
}
354354

355355
static void
356-
_bfd_xcoff64_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
356+
_bfd_xcoff64_swap_aux_in (abfd, ext1, type, in_class, indx, numaux, in1)
357357
bfd *abfd;
358358
PTR ext1;
359359
int type;
360-
int class;
360+
int in_class;
361361
int indx;
362362
int numaux;
363363
PTR in1;
364364
{
365365
union external_auxent *ext = (union external_auxent *) ext1;
366366
union internal_auxent *in = (union internal_auxent *) in1;
367367

368-
switch (class)
368+
switch (in_class)
369369
{
370370
case C_FILE:
371371
if (ext->x_file.x_n.x_zeroes[0] == 0)
@@ -420,7 +420,8 @@ _bfd_xcoff64_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
420420
break;
421421
}
422422

423-
if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
423+
if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
424+
|| ISTAG (in_class))
424425
{
425426
in->x_sym.x_fcnary.x_fcn.x_lnnoptr
426427
= H_GET_64 (abfd, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);
@@ -444,11 +445,11 @@ _bfd_xcoff64_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
444445
}
445446

446447
static unsigned int
447-
_bfd_xcoff64_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
448+
_bfd_xcoff64_swap_aux_out (abfd, inp, type, in_class, indx, numaux, extp)
448449
bfd *abfd;
449450
PTR inp;
450451
int type;
451-
int class;
452+
int in_class;
452453
int indx ATTRIBUTE_UNUSED;
453454
int numaux ATTRIBUTE_UNUSED;
454455
PTR extp;
@@ -457,7 +458,7 @@ _bfd_xcoff64_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
457458
union external_auxent *ext = (union external_auxent *) extp;
458459

459460
memset ((PTR) ext, 0, bfd_coff_auxesz (abfd));
460-
switch (class)
461+
switch (in_class)
461462
{
462463
case C_FILE:
463464
if (in->x_file.x_n.x_zeroes == 0)
@@ -506,7 +507,8 @@ _bfd_xcoff64_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
506507
break;
507508
}
508509

509-
if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
510+
if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
511+
|| ISTAG (in_class))
510512
{
511513
H_PUT_64 (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr,
512514
ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);

‎bfd/coffcode.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2443,9 +2443,9 @@ coff_pointerize_aux_hook (bfd *abfd ATTRIBUTE_UNUSED,
24432443
unsigned int indaux,
24442444
combined_entry_type *aux)
24452445
{
2446-
int class = symbol->u.syment.n_sclass;
2446+
int n_sclass = symbol->u.syment.n_sclass;
24472447

2448-
if (CSECT_SYM_P (class)
2448+
if (CSECT_SYM_P (n_sclass)
24492449
&& indaux + 1 == symbol->u.syment.n_numaux)
24502450
{
24512451
if (SMTYP_SMTYP (aux->u.auxent.x_csect.x_smtyp) == XTY_LD)

0 commit comments

Comments
 (0)