From 4e8a9624b8e07c195b8bd0f93b607ced5c11beb7 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 10 Jun 2001 05:21:00 +0000 Subject: [PATCH] * elflink.h: Whitespace changes. (elf_link_read_relocs_from_section): Use "unsigned int" iterator rather than "unsigned char". (elf_link_output_relocs): Likewise. (elf_link_input_bfd): Likewise. (elf_reloc_link_order): LIkewise. * elf.c: s/CONST/const/. Whitespace changes. * elf32-mips.c: Formatting fix. * Makefile.am (SOURCE_HFILES): Include xcoff-target.h, remove xcoff.h. * Makefile.in: Regenerate. * po/Make-in: Remove trailing tab. --- bfd/ChangeLog | 19 +++++++++++++++++-- bfd/Makefile.am | 3 ++- bfd/Makefile.in | 3 ++- bfd/elf.c | 50 +++++++++++++++++++++++++------------------------- bfd/elf32-mips.c | 2 +- bfd/elflink.h | 12 ++++++------ bfd/po/Make-in | 2 +- 7 files changed, 54 insertions(+), 37 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 488714d..d2c3d73 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,18 @@ +2001-06-10 Alan Modra + + * elflink.h: Whitespace changes. + (elf_link_read_relocs_from_section): Use "unsigned int" iterator + rather than "unsigned char". + (elf_link_output_relocs): Likewise. + (elf_link_input_bfd): Likewise. + (elf_reloc_link_order): LIkewise. + * elf.c: s/CONST/const/. Whitespace changes. + * elf32-mips.c: Formatting fix. + + * Makefile.am (SOURCE_HFILES): Include xcoff-target.h, remove xcoff.h. + * Makefile.in: Regenerate. + * po/Make-in: Remove trailing tab. + 2001-06-09 Philip Blundell * elf32-arm.h (elf32_arm_plt0_entry): Correct error in last @@ -53,7 +68,7 @@ * elf32-i386.c (elf_i386_check_relocs): Don't allocate .got and .relgot space here. (elf_i386_gc_sweep_hook): ..and no need to deallocate here.. - (elf32_hppa_adjust_dynamic_symbol): ..and don't allocate .plt and + (elf_i386_adjust_dynamic_symbol): ..and don't allocate .plt and .rel.plt here.. (allocate_plt_and_got): ..instead do it all here. New function. (elf_i386_size_dynamic_sections): Allocate local .got space and @@ -278,7 +293,7 @@ * reloc.c (bfd_reloc_code_real): Add MIPS ELF64 relocations. * libbfd.h: Regenerate. - * bfd0in2.h: Regenerate. + * bfd-in2.h: Regenerate. * aoutx.h (aout_@var{size}_machine_type): Add MIPS r12k support. * archures.c (bfd_mach_mips12000): Define. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index ecac5cc..27946f6 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -499,7 +499,8 @@ SOURCE_HFILES = \ elfcode.h elfcore.h elflink.h freebsd.h genlink.h go32stub.h \ libaout.h libbfd.h libcoff.h libecoff.h libhppa.h \ libieee.h libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h \ - nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h libxcoff.h xcoff.h + nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h libxcoff.h \ + xcoff-target.h ## ... and all .h files which are in the build tree. BUILD_HFILES = \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 3de9181..cdb0e17 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -629,7 +629,8 @@ SOURCE_HFILES = \ elfcode.h elfcore.h elflink.h freebsd.h genlink.h go32stub.h \ libaout.h libbfd.h libcoff.h libecoff.h libhppa.h \ libieee.h libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h \ - nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h libxcoff.h xcoff.h + nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h libxcoff.h \ + xcoff-target.h BUILD_HFILES = \ diff --git a/bfd/elf.c b/bfd/elf.c index 665d99f..191627c 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -829,8 +829,8 @@ bfd_elf_print_symbol (abfd, filep, symbol, how) break; case bfd_print_symbol_all: { - CONST char *section_name; - CONST char *name = NULL; + const char *section_name; + const char *name = NULL; struct elf_backend_data *bed; unsigned char st_other; @@ -5020,13 +5020,13 @@ _bfd_elf_set_arch_mach (abfd, arch, machine) static boolean elf_find_function (abfd, section, symbols, offset, - filename_ptr, functionname_ptr) + filename_ptr, functionname_ptr) bfd *abfd ATTRIBUTE_UNUSED; asection *section; asymbol **symbols; bfd_vma offset; - CONST char **filename_ptr; - CONST char **functionname_ptr; + const char **filename_ptr; + const char **functionname_ptr; { const char *filename; asymbol *func; @@ -5082,46 +5082,46 @@ elf_find_function (abfd, section, symbols, offset, boolean _bfd_elf_find_nearest_line (abfd, section, symbols, offset, - filename_ptr, functionname_ptr, line_ptr) + filename_ptr, functionname_ptr, line_ptr) bfd *abfd; asection *section; asymbol **symbols; bfd_vma offset; - CONST char **filename_ptr; - CONST char **functionname_ptr; + const char **filename_ptr; + const char **functionname_ptr; unsigned int *line_ptr; { boolean found; if (_bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset, - filename_ptr, functionname_ptr, - line_ptr)) + filename_ptr, functionname_ptr, + line_ptr)) { if (!*functionname_ptr) - elf_find_function (abfd, section, symbols, offset, - *filename_ptr ? NULL : filename_ptr, - functionname_ptr); - + elf_find_function (abfd, section, symbols, offset, + *filename_ptr ? NULL : filename_ptr, + functionname_ptr); + return true; } if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset, - filename_ptr, functionname_ptr, - line_ptr, 0, - &elf_tdata (abfd)->dwarf2_find_line_info)) + filename_ptr, functionname_ptr, + line_ptr, 0, + &elf_tdata (abfd)->dwarf2_find_line_info)) { if (!*functionname_ptr) - elf_find_function (abfd, section, symbols, offset, - *filename_ptr ? NULL : filename_ptr, - functionname_ptr); - + elf_find_function (abfd, section, symbols, offset, + *filename_ptr ? NULL : filename_ptr, + functionname_ptr); + return true; } if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, - &found, filename_ptr, - functionname_ptr, line_ptr, - &elf_tdata (abfd)->line_info)) + &found, filename_ptr, + functionname_ptr, line_ptr, + &elf_tdata (abfd)->line_info)) return false; if (found) return true; @@ -5130,7 +5130,7 @@ _bfd_elf_find_nearest_line (abfd, section, symbols, offset, return false; if (! elf_find_function (abfd, section, symbols, offset, - filename_ptr, functionname_ptr)) + filename_ptr, functionname_ptr)) return false; *line_ptr = 0; diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index de0e529..cc9a4bf 100644 --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -249,8 +249,8 @@ static bfd *reldyn_sorting_bfd; (abfd->xvec == &bfd_elf32_tradlittlemips_vec)) ? ict_none : \ ((ABI_N32_P (abfd) || ABI_64_P (abfd)) ? ict_irix6 : ict_irix5)) #endif -/* Whether we are trying to be compatible with IRIX at all. */ +/* Whether we are trying to be compatible with IRIX at all. */ #define SGI_COMPAT(abfd) \ (IRIX_COMPAT (abfd) != ict_none) diff --git a/bfd/elflink.h b/bfd/elflink.h index db1c593..e1dee8d 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -121,7 +121,7 @@ is_global_data_symbol_definition (abfd, sym) } /* Search the symbol table of the archive element of the archive ABFD - whoes archive map contains a mention of SYMDEF, and determine if + whose archive map contains a mention of SYMDEF, and determine if the symbol is defined in this element. */ static boolean elf_link_is_defined_archive_symbol (abfd, symdef) @@ -2471,7 +2471,7 @@ elf_link_read_relocs_from_section (abfd, shdr, external_relocs, * sizeof (Elf_Internal_Rel))); for (; erel < erelend; erel++, irela += bed->s->int_rels_per_ext_rel) { - unsigned char i; + unsigned int i; if (bed->s->swap_reloc_in) (*bed->s->swap_reloc_in) (abfd, (bfd_byte *) erel, irel); @@ -5484,7 +5484,7 @@ elf_link_output_relocs (output_bfd, input_section, input_rel_hdr, erel = ((Elf_External_Rel *) output_rel_hdr->contents + *rel_countp); for (; irela < irelaend; irela += bed->s->int_rels_per_ext_rel, erel++) { - unsigned char i; + unsigned int i; for (i = 0; i < bed->s->int_rels_per_ext_rel; i++) { @@ -5840,7 +5840,7 @@ elf_link_input_bfd (finfo, input_bfd) Elf_Internal_Rela *irelaend; struct elf_link_hash_entry **rel_hash; Elf_Internal_Shdr *input_rel_hdr; - unsigned char next_erel; + unsigned int next_erel; /* Adjust the reloc addresses and symbol indices. */ @@ -6162,7 +6162,7 @@ elf_reloc_link_order (output_bfd, info, output_section, link_order) { Elf_Internal_Rel *irel; Elf_External_Rel *erel; - unsigned char i; + unsigned int i; irel = (Elf_Internal_Rel *) bfd_zmalloc (bed->s->int_rels_per_ext_rel * sizeof (Elf_Internal_Rel)); @@ -6187,7 +6187,7 @@ elf_reloc_link_order (output_bfd, info, output_section, link_order) { Elf_Internal_Rela *irela; Elf_External_Rela *erela; - unsigned char i; + unsigned int i; irela = (Elf_Internal_Rela *) bfd_zmalloc (bed->s->int_rels_per_ext_rel * sizeof (Elf_Internal_Rela)); diff --git a/bfd/po/Make-in b/bfd/po/Make-in index 74b8673..2414748 100644 --- a/bfd/po/Make-in +++ b/bfd/po/Make-in @@ -206,7 +206,7 @@ clean: mostlyclean distclean: clean rm -f Makefile Makefile.in *.mo *.msg *.cat *.cat.m rm -f SRC-POTFILES BLD-POTFILES SRC-POTFILES.in BLD-POTFILES.in - + maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -- 2.7.4