From 75f3ef7a635af631d1dd69a42c3a41e3da692b3a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 20 Jun 1994 19:39:15 +0000 Subject: [PATCH] * ecoff.c, libecoff.h, ecoffswap.h, coff-alpha.c, coff-mips.c, elf32-mips.c: Renamed all externally visible ECOFF routines which are local to BFD to start with _bfd_ecoff instead of just ecoff. --- bfd/ChangeLog | 4 ++ bfd/coff-alpha.c | 43 +++++++++--------- bfd/coff-mips.c | 63 +++++++++++++------------- bfd/ecoff.c | 113 +++++++++++++++++++++++------------------------ bfd/elf32-mips.c | 8 ++-- bfd/libecoff.h | 132 ++++++++++++++++++++++++------------------------------- 6 files changed, 175 insertions(+), 188 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f169f3d..bce328d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,9 @@ Mon Jun 20 11:06:27 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + * ecoff.c, libecoff.h, ecoffswap.h, coff-alpha.c, coff-mips.c, + elf32-mips.c: Renamed all externally visible ECOFF routines which + are local to BFD to start with _bfd_ecoff instead of just ecoff. + * ecoff.c (ecoff_swap_tir_in): Change input argument to const. (ecoff_swap_tir_out): Likewise. (ecoff_swap_rndx_in, ecoff_swap_rndx_out): Likewise. diff --git a/bfd/coff-alpha.c b/bfd/coff-alpha.c index b166081..1cdb340 100644 --- a/bfd/coff-alpha.c +++ b/bfd/coff-alpha.c @@ -1914,9 +1914,10 @@ static const struct ecoff_backend_data alpha_ecoff_backend_data = FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, true, alpha_ecoff_swap_filehdr_in, alpha_ecoff_swap_aouthdr_in, alpha_ecoff_swap_scnhdr_in, alpha_ecoff_bad_format_hook, - ecoff_set_arch_mach_hook, ecoff_mkobject_hook, - ecoff_styp_to_sec_flags, ecoff_make_section_hook, ecoff_set_alignment_hook, - ecoff_slurp_symbol_table, NULL, NULL + _bfd_ecoff_set_arch_mach_hook, _bfd_ecoff_mkobject_hook, + _bfd_ecoff_styp_to_sec_flags, _bfd_ecoff_make_section_hook, + _bfd_ecoff_set_alignment_hook, _bfd_ecoff_slurp_symbol_table, + NULL, NULL }, /* Supported architecture. */ bfd_arch_alpha, @@ -1956,8 +1957,8 @@ static const struct ecoff_backend_data alpha_ecoff_backend_data = ecoff_swap_fdr_in, ecoff_swap_rfd_in, ecoff_swap_ext_in, - ecoff_swap_tir_in, - ecoff_swap_rndx_in, + _bfd_ecoff_swap_tir_in, + _bfd_ecoff_swap_rndx_in, /* Functions to swap out external symbolic data. */ ecoff_swap_hdr_out, ecoff_swap_dnr_out, @@ -1967,10 +1968,10 @@ static const struct ecoff_backend_data alpha_ecoff_backend_data = ecoff_swap_fdr_out, ecoff_swap_rfd_out, ecoff_swap_ext_out, - ecoff_swap_tir_out, - ecoff_swap_rndx_out, + _bfd_ecoff_swap_tir_out, + _bfd_ecoff_swap_rndx_out, /* Function to read in symbolic data. */ - ecoff_slurp_symbolic_info + _bfd_ecoff_slurp_symbolic_info }, /* External reloc size. */ RELSZ, @@ -1985,14 +1986,14 @@ static const struct ecoff_backend_data alpha_ecoff_backend_data = }; /* Looking up a reloc type is Alpha specific. */ -#define ecoff_bfd_reloc_type_lookup alpha_bfd_reloc_type_lookup +#define _bfd_ecoff_bfd_reloc_type_lookup alpha_bfd_reloc_type_lookup /* So is getting relocated section contents. */ -#define ecoff_bfd_get_relocated_section_contents \ +#define _bfd_ecoff_bfd_get_relocated_section_contents \ alpha_ecoff_get_relocated_section_contents /* Relaxing sections is generic. */ -#define ecoff_bfd_relax_section bfd_generic_relax_section +#define _bfd_ecoff_bfd_relax_section bfd_generic_relax_section bfd_target ecoffalpha_little_vec = { @@ -2019,20 +2020,20 @@ bfd_target ecoffalpha_little_vec = bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */ {_bfd_dummy_target, alpha_ecoff_object_p, /* bfd_check_format */ - ecoff_archive_p, _bfd_dummy_target}, - {bfd_false, ecoff_mkobject, /* bfd_set_format */ + _bfd_ecoff_archive_p, _bfd_dummy_target}, + {bfd_false, _bfd_ecoff_mkobject, /* bfd_set_format */ _bfd_generic_mkarchive, bfd_false}, - {bfd_false, ecoff_write_object_contents, /* bfd_write_contents */ + {bfd_false, _bfd_ecoff_write_object_contents, /* bfd_write_contents */ _bfd_write_archive_contents, bfd_false}, - BFD_JUMP_TABLE_GENERIC (ecoff), - BFD_JUMP_TABLE_COPY (ecoff), + BFD_JUMP_TABLE_GENERIC (_bfd_ecoff), + BFD_JUMP_TABLE_COPY (_bfd_ecoff), BFD_JUMP_TABLE_CORE (_bfd_nocore), - BFD_JUMP_TABLE_ARCHIVE (ecoff), - BFD_JUMP_TABLE_SYMBOLS (ecoff), - BFD_JUMP_TABLE_RELOCS (ecoff), - BFD_JUMP_TABLE_WRITE (ecoff), - BFD_JUMP_TABLE_LINK (ecoff), + BFD_JUMP_TABLE_ARCHIVE (_bfd_ecoff), + BFD_JUMP_TABLE_SYMBOLS (_bfd_ecoff), + BFD_JUMP_TABLE_RELOCS (_bfd_ecoff), + BFD_JUMP_TABLE_WRITE (_bfd_ecoff), + BFD_JUMP_TABLE_LINK (_bfd_ecoff), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), (PTR) &alpha_ecoff_backend_data diff --git a/bfd/coff-mips.c b/bfd/coff-mips.c index 8105bbb..768821e 100644 --- a/bfd/coff-mips.c +++ b/bfd/coff-mips.c @@ -2278,9 +2278,10 @@ static const struct ecoff_backend_data mips_ecoff_backend_data = FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, true, mips_ecoff_swap_filehdr_in, mips_ecoff_swap_aouthdr_in, mips_ecoff_swap_scnhdr_in, mips_ecoff_bad_format_hook, - ecoff_set_arch_mach_hook, ecoff_mkobject_hook, - ecoff_styp_to_sec_flags, ecoff_make_section_hook, ecoff_set_alignment_hook, - ecoff_slurp_symbol_table, NULL, NULL + _bfd_ecoff_set_arch_mach_hook, _bfd_ecoff_mkobject_hook, + _bfd_ecoff_styp_to_sec_flags, _bfd_ecoff_make_section_hook, + _bfd_ecoff_set_alignment_hook, _bfd_ecoff_slurp_symbol_table, + NULL, NULL }, /* Supported architecture. */ bfd_arch_mips, @@ -2320,8 +2321,8 @@ static const struct ecoff_backend_data mips_ecoff_backend_data = ecoff_swap_fdr_in, ecoff_swap_rfd_in, ecoff_swap_ext_in, - ecoff_swap_tir_in, - ecoff_swap_rndx_in, + _bfd_ecoff_swap_tir_in, + _bfd_ecoff_swap_rndx_in, /* Functions to swap out external symbolic data. */ ecoff_swap_hdr_out, ecoff_swap_dnr_out, @@ -2331,10 +2332,10 @@ static const struct ecoff_backend_data mips_ecoff_backend_data = ecoff_swap_fdr_out, ecoff_swap_rfd_out, ecoff_swap_ext_out, - ecoff_swap_tir_out, - ecoff_swap_rndx_out, + _bfd_ecoff_swap_tir_out, + _bfd_ecoff_swap_rndx_out, /* Function to read in symbolic data. */ - ecoff_slurp_symbolic_info + _bfd_ecoff_slurp_symbolic_info }, /* External reloc size. */ RELSZ, @@ -2349,14 +2350,14 @@ static const struct ecoff_backend_data mips_ecoff_backend_data = }; /* Looking up a reloc type is MIPS specific. */ -#define ecoff_bfd_reloc_type_lookup mips_bfd_reloc_type_lookup +#define _bfd_ecoff_bfd_reloc_type_lookup mips_bfd_reloc_type_lookup /* Getting relocated section contents is generic. */ -#define ecoff_bfd_get_relocated_section_contents \ +#define _bfd_ecoff_bfd_get_relocated_section_contents \ bfd_generic_get_relocated_section_contents /* Relaxing sections is MIPS specific. */ -#define ecoff_bfd_relax_section mips_relax_section +#define _bfd_ecoff_bfd_relax_section mips_relax_section bfd_target ecoff_little_vec = { @@ -2383,20 +2384,20 @@ bfd_target ecoff_little_vec = bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */ {_bfd_dummy_target, coff_object_p, /* bfd_check_format */ - ecoff_archive_p, _bfd_dummy_target}, - {bfd_false, ecoff_mkobject, /* bfd_set_format */ + _bfd_ecoff_archive_p, _bfd_dummy_target}, + {bfd_false, _bfd_ecoff_mkobject, /* bfd_set_format */ _bfd_generic_mkarchive, bfd_false}, - {bfd_false, ecoff_write_object_contents, /* bfd_write_contents */ + {bfd_false, _bfd_ecoff_write_object_contents, /* bfd_write_contents */ _bfd_write_archive_contents, bfd_false}, - BFD_JUMP_TABLE_GENERIC (ecoff), - BFD_JUMP_TABLE_COPY (ecoff), + BFD_JUMP_TABLE_GENERIC (_bfd_ecoff), + BFD_JUMP_TABLE_COPY (_bfd_ecoff), BFD_JUMP_TABLE_CORE (_bfd_nocore), - BFD_JUMP_TABLE_ARCHIVE (ecoff), - BFD_JUMP_TABLE_SYMBOLS (ecoff), - BFD_JUMP_TABLE_RELOCS (ecoff), - BFD_JUMP_TABLE_WRITE (ecoff), - BFD_JUMP_TABLE_LINK (ecoff), + BFD_JUMP_TABLE_ARCHIVE (_bfd_ecoff), + BFD_JUMP_TABLE_SYMBOLS (_bfd_ecoff), + BFD_JUMP_TABLE_RELOCS (_bfd_ecoff), + BFD_JUMP_TABLE_WRITE (_bfd_ecoff), + BFD_JUMP_TABLE_LINK (_bfd_ecoff), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), (PTR) &mips_ecoff_backend_data @@ -2425,20 +2426,20 @@ bfd_target ecoff_big_vec = bfd_getb32, bfd_getb_signed_32, bfd_putb32, bfd_getb16, bfd_getb_signed_16, bfd_putb16, {_bfd_dummy_target, coff_object_p, /* bfd_check_format */ - ecoff_archive_p, _bfd_dummy_target}, - {bfd_false, ecoff_mkobject, /* bfd_set_format */ + _bfd_ecoff_archive_p, _bfd_dummy_target}, + {bfd_false, _bfd_ecoff_mkobject, /* bfd_set_format */ _bfd_generic_mkarchive, bfd_false}, - {bfd_false, ecoff_write_object_contents, /* bfd_write_contents */ + {bfd_false, _bfd_ecoff_write_object_contents, /* bfd_write_contents */ _bfd_write_archive_contents, bfd_false}, - BFD_JUMP_TABLE_GENERIC (ecoff), - BFD_JUMP_TABLE_COPY (ecoff), + BFD_JUMP_TABLE_GENERIC (_bfd_ecoff), + BFD_JUMP_TABLE_COPY (_bfd_ecoff), BFD_JUMP_TABLE_CORE (_bfd_nocore), - BFD_JUMP_TABLE_ARCHIVE (ecoff), - BFD_JUMP_TABLE_SYMBOLS (ecoff), - BFD_JUMP_TABLE_RELOCS (ecoff), - BFD_JUMP_TABLE_WRITE (ecoff), - BFD_JUMP_TABLE_LINK (ecoff), + BFD_JUMP_TABLE_ARCHIVE (_bfd_ecoff), + BFD_JUMP_TABLE_SYMBOLS (_bfd_ecoff), + BFD_JUMP_TABLE_RELOCS (_bfd_ecoff), + BFD_JUMP_TABLE_WRITE (_bfd_ecoff), + BFD_JUMP_TABLE_LINK (_bfd_ecoff), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), (PTR) &mips_ecoff_backend_data diff --git a/bfd/ecoff.c b/bfd/ecoff.c index 45a378f..43e2f30 100644 --- a/bfd/ecoff.c +++ b/bfd/ecoff.c @@ -45,6 +45,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Prototypes for static functions. */ static int ecoff_get_magic PARAMS ((bfd *abfd)); +static long ecoff_sec_to_styp_flags PARAMS ((const char *name, + flagword flags)); static boolean ecoff_slurp_symbolic_header PARAMS ((bfd *abfd)); static boolean ecoff_set_symbol_info PARAMS ((bfd *abfd, SYMR *ecoff_sym, asymbol *asym, int ext, @@ -73,7 +75,7 @@ static asection bfd_debug_section = { "*DEBUG*" }; /* Create an ECOFF object. */ boolean -ecoff_mkobject (abfd) +_bfd_ecoff_mkobject (abfd) bfd *abfd; { abfd->tdata.ecoff_obj_data = ((struct ecoff_tdata *) @@ -91,7 +93,7 @@ ecoff_mkobject (abfd) specific information. */ PTR -ecoff_mkobject_hook (abfd, filehdr, aouthdr) +_bfd_ecoff_mkobject_hook (abfd, filehdr, aouthdr) bfd *abfd; PTR filehdr; PTR aouthdr; @@ -100,7 +102,7 @@ ecoff_mkobject_hook (abfd, filehdr, aouthdr) struct internal_aouthdr *internal_a = (struct internal_aouthdr *) aouthdr; ecoff_data_type *ecoff; - if (ecoff_mkobject (abfd) == false) + if (_bfd_ecoff_mkobject (abfd) == false) return NULL; ecoff = ecoff_data (abfd); @@ -135,7 +137,7 @@ ecoff_mkobject_hook (abfd, filehdr, aouthdr) /*ARGSUSED*/ asection * -ecoff_make_section_hook (abfd, name) +_bfd_ecoff_make_section_hook (abfd, name) bfd *abfd; char *name; { @@ -145,7 +147,7 @@ ecoff_make_section_hook (abfd, name) /* Initialize a new section. */ boolean -ecoff_new_section_hook (abfd, section) +_bfd_ecoff_new_section_hook (abfd, section) bfd *abfd; asection *section; { @@ -190,7 +192,7 @@ ecoff_new_section_hook (abfd, section) for each target, but there aren't all that many ECOFF targets. */ boolean -ecoff_set_arch_mach_hook (abfd, filehdr) +_bfd_ecoff_set_arch_mach_hook (abfd, filehdr) bfd *abfd; PTR filehdr; { @@ -236,7 +238,7 @@ ecoff_set_arch_mach_hook (abfd, filehdr) } /* Get the magic number to use based on the architecture and machine. - This is the inverse of ecoff_set_arch_mach_hook, above. */ + This is the inverse of _bfd_ecoff_set_arch_mach_hook, above. */ static int ecoff_get_magic (abfd) @@ -280,9 +282,9 @@ ecoff_get_magic (abfd) /* Get the section s_flags to use for a section. */ -long +static long ecoff_sec_to_styp_flags (name, flags) - CONST char *name; + const char *name; flagword flags; { long styp; @@ -338,7 +340,7 @@ ecoff_sec_to_styp_flags (name, flags) /*ARGSUSED*/ flagword -ecoff_styp_to_sec_flags (abfd, hdr) +_bfd_ecoff_styp_to_sec_flags (abfd, hdr) bfd *abfd; PTR hdr; { @@ -410,7 +412,7 @@ ecoff_styp_to_sec_flags (abfd, hdr) info comes from the file header record (fh-fBigendian). */ void -ecoff_swap_tir_in (bigend, ext_copy, intern) +_bfd_ecoff_swap_tir_in (bigend, ext_copy, intern) int bigend; const struct tir_ext *ext_copy; TIR *intern; @@ -467,7 +469,7 @@ ecoff_swap_tir_in (bigend, ext_copy, intern) info comes from the file header record (fh-fBigendian). */ void -ecoff_swap_tir_out (bigend, intern_copy, ext) +_bfd_ecoff_swap_tir_out (bigend, intern_copy, ext) int bigend; const TIR *intern_copy; struct tir_ext *ext; @@ -523,7 +525,7 @@ ecoff_swap_tir_out (bigend, intern_copy, ext) big-endian or little-endian format.*/ void -ecoff_swap_rndx_in (bigend, ext_copy, intern) +_bfd_ecoff_swap_rndx_in (bigend, ext_copy, intern) int bigend; const struct rndx_ext *ext_copy; RNDXR *intern; @@ -562,7 +564,7 @@ ecoff_swap_rndx_in (bigend, ext_copy, intern) big-endian or little-endian format.*/ void -ecoff_swap_rndx_out (bigend, intern_copy, ext) +_bfd_ecoff_swap_rndx_out (bigend, intern_copy, ext) int bigend; const RNDXR *intern_copy; struct rndx_ext *ext; @@ -670,7 +672,7 @@ ecoff_slurp_symbolic_header (abfd) /*ARGSUSED*/ boolean -ecoff_slurp_symbolic_info (abfd, ignore, debug) +_bfd_ecoff_slurp_symbolic_info (abfd, ignore, debug) bfd *abfd; asection *ignore; struct ecoff_debug_info *debug; @@ -821,7 +823,7 @@ static asymbol *ecoff_scom_symbol_ptr; /* Create an empty symbol. */ asymbol * -ecoff_make_empty_symbol (abfd) +_bfd_ecoff_make_empty_symbol (abfd) bfd *abfd; { ecoff_symbol_type *new; @@ -1107,7 +1109,7 @@ ecoff_set_symbol_info (abfd, ecoff_sym, asym, ext, indirect_ptr_ptr) /* Read an ECOFF symbol table. */ boolean -ecoff_slurp_symbol_table (abfd) +_bfd_ecoff_slurp_symbol_table (abfd) bfd *abfd; { const struct ecoff_backend_data * const backend = ecoff_backend (abfd); @@ -1133,8 +1135,8 @@ ecoff_slurp_symbol_table (abfd) return true; /* Get the symbolic information. */ - if (! ecoff_slurp_symbolic_info (abfd, (asection *) NULL, - &ecoff_data (abfd)->debug_info)) + if (! _bfd_ecoff_slurp_symbolic_info (abfd, (asection *) NULL, + &ecoff_data (abfd)->debug_info)) return false; if (bfd_get_symcount (abfd) == 0) return true; @@ -1214,11 +1216,11 @@ ecoff_slurp_symbol_table (abfd) /* Return the amount of space needed for the canonical symbols. */ long -ecoff_get_symtab_upper_bound (abfd) +_bfd_ecoff_get_symtab_upper_bound (abfd) bfd *abfd; { - if (! ecoff_slurp_symbolic_info (abfd, (asection *) NULL, - &ecoff_data (abfd)->debug_info)) + if (! _bfd_ecoff_slurp_symbolic_info (abfd, (asection *) NULL, + &ecoff_data (abfd)->debug_info)) return -1; if (bfd_get_symcount (abfd) == 0) @@ -1230,7 +1232,7 @@ ecoff_get_symtab_upper_bound (abfd) /* Get the canonical symbols. */ long -ecoff_get_symtab (abfd, alocation) +_bfd_ecoff_get_symtab (abfd, alocation) bfd *abfd; asymbol **alocation; { @@ -1238,7 +1240,7 @@ ecoff_get_symtab (abfd, alocation) ecoff_symbol_type *symbase; ecoff_symbol_type **location = (ecoff_symbol_type **) alocation; - if (ecoff_slurp_symbol_table (abfd) == false) + if (_bfd_ecoff_slurp_symbol_table (abfd) == false) return -1; if (bfd_get_symcount (abfd) == 0) return 0; @@ -1357,7 +1359,7 @@ ecoff_type_to_string (abfd, fdr, indx) if (AUX_GET_ISYM (bigendian, &aux_ptr[indx]) == -1) return "-1 (no type)"; - ecoff_swap_tir_in (bigendian, &aux_ptr[indx++].a_ti, &u.ti); + _bfd_ecoff_swap_tir_in (bigendian, &aux_ptr[indx++].a_ti, &u.ti); basic_type = u.ti.bt; qualifiers[0].type = u.ti.tq0; @@ -1426,7 +1428,7 @@ ecoff_type_to_string (abfd, fdr, indx) 2nd word is file index if 1st word rfd is ST_RFDESCAPE. */ case btStruct: /* Structure (Record) */ - ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx); + _bfd_ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx); ecoff_emit_aggregate (abfd, fdr, p1, &rndx, (long) AUX_GET_ISYM (bigendian, &aux_ptr[indx+1]), "struct"); @@ -1438,7 +1440,7 @@ ecoff_type_to_string (abfd, fdr, indx) 2nd word is file index if 1st word rfd is ST_RFDESCAPE. */ case btUnion: /* Union */ - ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx); + _bfd_ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx); ecoff_emit_aggregate (abfd, fdr, p1, &rndx, (long) AUX_GET_ISYM (bigendian, &aux_ptr[indx+1]), "union"); @@ -1450,7 +1452,7 @@ ecoff_type_to_string (abfd, fdr, indx) 2nd word is file index if 1st word rfd is ST_RFDESCAPE. */ case btEnum: /* Enumeration */ - ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx); + _bfd_ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx); ecoff_emit_aggregate (abfd, fdr, p1, &rndx, (long) AUX_GET_ISYM (bigendian, &aux_ptr[indx+1]), "enum"); @@ -1633,7 +1635,7 @@ ecoff_type_to_string (abfd, fdr, indx) /*ARGSUSED*/ void -ecoff_get_symbol_info (abfd, symbol, ret) +_bfd_ecoff_get_symbol_info (abfd, symbol, ret) bfd *abfd; /* Ignored. */ asymbol *symbol; symbol_info *ret; @@ -1644,7 +1646,7 @@ ecoff_get_symbol_info (abfd, symbol, ret) /* Print information about an ECOFF symbol. */ void -ecoff_print_symbol (abfd, filep, symbol, how) +_bfd_ecoff_print_symbol (abfd, filep, symbol, how) bfd *abfd; PTR filep; asymbol *symbol; @@ -1851,7 +1853,7 @@ ecoff_slurp_reloc_table (abfd, section, symbols) || (section->flags & SEC_CONSTRUCTOR) != 0) return true; - if (ecoff_slurp_symbol_table (abfd) == false) + if (_bfd_ecoff_slurp_symbol_table (abfd) == false) return false; internal_relocs = (arelent *) bfd_alloc (abfd, @@ -1945,7 +1947,7 @@ ecoff_slurp_reloc_table (abfd, section, symbols) /* Get a canonical list of relocs. */ long -ecoff_canonicalize_reloc (abfd, section, relptr, symbols) +_bfd_ecoff_canonicalize_reloc (abfd, section, relptr, symbols) bfd *abfd; asection *section; arelent **relptr; @@ -1989,13 +1991,8 @@ ecoff_canonicalize_reloc (abfd, section, relptr, symbols) /*ARGSUSED*/ boolean -ecoff_find_nearest_line (abfd, - section, - ignore_symbols, - offset, - filename_ptr, - functionname_ptr, - retline_ptr) +_bfd_ecoff_find_nearest_line (abfd, section, ignore_symbols, offset, + filename_ptr, functionname_ptr, retline_ptr) bfd *abfd; asection *section; asymbol **ignore_symbols; @@ -2027,8 +2024,8 @@ ecoff_find_nearest_line (abfd, return false; /* Make sure we have the FDR's. */ - if (! ecoff_slurp_symbolic_info (abfd, (asection *) NULL, - &ecoff_data (abfd)->debug_info) + if (! _bfd_ecoff_slurp_symbolic_info (abfd, (asection *) NULL, + &ecoff_data (abfd)->debug_info) || bfd_get_symcount (abfd) == 0) return false; @@ -2175,7 +2172,7 @@ ecoff_find_nearest_line (abfd, information. */ boolean -ecoff_bfd_copy_private_bfd_data (ibfd, obfd) +_bfd_ecoff_bfd_copy_private_bfd_data (ibfd, obfd) bfd *ibfd; bfd *obfd; { @@ -2285,7 +2282,7 @@ ecoff_bfd_copy_private_bfd_data (ibfd, obfd) callers ignore the return value. */ boolean -ecoff_set_arch_mach (abfd, arch, machine) +_bfd_ecoff_set_arch_mach (abfd, arch, machine) bfd *abfd; enum bfd_architecture arch; unsigned long machine; @@ -2298,7 +2295,7 @@ ecoff_set_arch_mach (abfd, arch, machine) /*ARGSUSED*/ int -ecoff_sizeof_headers (abfd, reloc) +_bfd_ecoff_sizeof_headers (abfd, reloc) bfd *abfd; boolean reloc; { @@ -2321,7 +2318,7 @@ ecoff_sizeof_headers (abfd, reloc) /* Get the contents of a section. */ boolean -ecoff_get_section_contents (abfd, section, location, offset, count) +_bfd_ecoff_get_section_contents (abfd, section, location, offset, count) bfd *abfd; asection *section; PTR location; @@ -2344,7 +2341,7 @@ ecoff_compute_section_file_positions (abfd) file_ptr old_sofar; boolean first_data; - sofar = ecoff_sizeof_headers (abfd, false); + sofar = _bfd_ecoff_sizeof_headers (abfd, false); first_data = true; for (current = abfd->sections; @@ -2475,7 +2472,7 @@ ecoff_compute_reloc_file_positions (abfd) /* Set the contents of a section. */ boolean -ecoff_set_section_contents (abfd, section, location, offset, count) +_bfd_ecoff_set_section_contents (abfd, section, location, offset, count) bfd *abfd; asection *section; PTR location; @@ -2652,7 +2649,7 @@ ecoff_set_index (sym, indx) /* Write out an ECOFF file. */ boolean -ecoff_write_object_contents (abfd) +_bfd_ecoff_write_object_contents (abfd) bfd *abfd; { const struct ecoff_backend_data * const backend = ecoff_backend (abfd); @@ -2703,7 +2700,7 @@ ecoff_write_object_contents (abfd) } if ((abfd->flags & D_PAGED) != 0) - text_size = ecoff_sizeof_headers (abfd, false); + text_size = _bfd_ecoff_sizeof_headers (abfd, false); else text_size = 0; text_start = 0; @@ -3155,7 +3152,7 @@ ecoff_armap_hash (s, rehash, size, hlog) /* Read in the armap. */ boolean -ecoff_slurp_armap (abfd) +_bfd_ecoff_slurp_armap (abfd) bfd *abfd; { char nextname[17]; @@ -3328,7 +3325,7 @@ ecoff_slurp_armap (abfd) /* Write out an armap. */ boolean -ecoff_write_armap (abfd, elength, map, orl_count, stridx) +_bfd_ecoff_write_armap (abfd, elength, map, orl_count, stridx) bfd *abfd; unsigned int elength; struct orl *map; @@ -3494,7 +3491,7 @@ ecoff_write_armap (abfd, elength, map, orl_count, stridx) and the extended name table. */ bfd_target * -ecoff_archive_p (abfd) +_bfd_ecoff_archive_p (abfd) bfd *abfd; { char armag[SARMAG + 1]; @@ -3526,8 +3523,8 @@ ecoff_archive_p (abfd) bfd_ardata (abfd)->extended_names = NULL; bfd_ardata (abfd)->tdata = NULL; - if (ecoff_slurp_armap (abfd) == false - || ecoff_slurp_extended_name_table (abfd) == false) + if (_bfd_ecoff_slurp_armap (abfd) == false + || _bfd_ecoff_slurp_extended_name_table (abfd) == false) { bfd_release (abfd, bfd_ardata (abfd)); abfd->tdata.aout_ar_data = (struct artdata *) NULL; @@ -3594,7 +3591,7 @@ ecoff_link_hash_newfunc (entry, table, string) /* Create an ECOFF link hash table. */ struct bfd_link_hash_table * -ecoff_bfd_link_hash_table_create (abfd) +_bfd_ecoff_bfd_link_hash_table_create (abfd) bfd *abfd; { struct ecoff_link_hash_table *ret; @@ -3638,7 +3635,7 @@ ecoff_bfd_link_hash_table_create (abfd) appropriate. */ boolean -ecoff_bfd_link_add_symbols (abfd, info) +_bfd_ecoff_bfd_link_add_symbols (abfd, info) bfd *abfd; struct bfd_link_info *info; { @@ -4226,7 +4223,7 @@ static boolean ecoff_reloc_link_order close and reopen some input BFDs; I'll see how bad this is. */ boolean -ecoff_bfd_final_link (abfd, info) +_bfd_ecoff_bfd_final_link (abfd, info) bfd *abfd; struct bfd_link_info *info; { @@ -4461,7 +4458,7 @@ ecoff_final_link_debug_accumulate (output_bfd, input_bfd, info, handle) } /* If raw_syments is not NULL, then the data was already by read by - ecoff_slurp_symbolic_info. */ + _bfd_ecoff_slurp_symbolic_info. */ if (ecoff_data (input_bfd)->raw_syments == NULL) { READ (line, cbLineOffset, cbLine, sizeof (unsigned char), diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index 31fe8ee..6148a5a 100644 --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -2419,8 +2419,8 @@ static const struct ecoff_debug_swap mips_elf_ecoff_debug_swap = ecoff_swap_fdr_in, ecoff_swap_rfd_in, ecoff_swap_ext_in, - ecoff_swap_tir_in, - ecoff_swap_rndx_in, + _bfd_ecoff_swap_tir_in, + _bfd_ecoff_swap_rndx_in, /* Functions to swap out external symbolic data. */ ecoff_swap_hdr_out, ecoff_swap_dnr_out, @@ -2430,8 +2430,8 @@ static const struct ecoff_debug_swap mips_elf_ecoff_debug_swap = ecoff_swap_fdr_out, ecoff_swap_rfd_out, ecoff_swap_ext_out, - ecoff_swap_tir_out, - ecoff_swap_rndx_out, + _bfd_ecoff_swap_tir_out, + _bfd_ecoff_swap_rndx_out, /* Function to read in symbolic data. */ mips_elf_read_ecoff_info }; diff --git a/bfd/libecoff.h b/bfd/libecoff.h index 84349f0..3ff4789 100644 --- a/bfd/libecoff.h +++ b/bfd/libecoff.h @@ -80,7 +80,7 @@ typedef struct ecoff_tdata ecoff_compute_section_file_positions. */ file_ptr reloc_filepos; - /* The symbol table file position, set by ecoff_mkobject_hook. */ + /* The symbol table file position, set by _bfd_ecoff_mkobject_hook. */ file_ptr sym_filepos; /* The start and end of the text segment. Only valid for an @@ -220,94 +220,78 @@ struct ecoff_link_hash_table }; /* Make an ECOFF object. */ -extern boolean ecoff_mkobject PARAMS ((bfd *)); +extern boolean _bfd_ecoff_mkobject PARAMS ((bfd *)); /* Read in the ECOFF symbolic debugging information. */ -extern boolean ecoff_slurp_symbolic_info PARAMS ((bfd *, asection *, - struct ecoff_debug_info *)); +extern boolean _bfd_ecoff_slurp_symbolic_info + PARAMS ((bfd *, asection *, struct ecoff_debug_info *)); /* Generic ECOFF BFD backend vectors. */ -extern boolean ecoff_write_object_contents PARAMS ((bfd *abfd)); -extern bfd_target *ecoff_archive_p PARAMS ((bfd *abfd)); - -#define ecoff_close_and_cleanup _bfd_generic_close_and_cleanup -#define ecoff_bfd_free_cached_info _bfd_generic_bfd_free_cached_info -extern boolean ecoff_new_section_hook PARAMS ((bfd *abfd, - asection *section)); -extern boolean ecoff_get_section_contents PARAMS ((bfd *abfd, - asection *section, - PTR location, - file_ptr offset, - bfd_size_type count)); - -extern boolean ecoff_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *)); -#define ecoff_bfd_copy_private_section_data \ +extern boolean _bfd_ecoff_write_object_contents PARAMS ((bfd *abfd)); +extern bfd_target *_bfd_ecoff_archive_p PARAMS ((bfd *abfd)); + +#define _bfd_ecoff_close_and_cleanup _bfd_generic_close_and_cleanup +#define _bfd_ecoff_bfd_free_cached_info _bfd_generic_bfd_free_cached_info +extern boolean _bfd_ecoff_new_section_hook + PARAMS ((bfd *, asection *)); +extern boolean _bfd_ecoff_get_section_contents + PARAMS ((bfd *, asection *, PTR location, file_ptr, bfd_size_type)); + +extern boolean _bfd_ecoff_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *)); +#define _bfd_ecoff_bfd_copy_private_section_data \ _bfd_generic_bfd_copy_private_section_data -extern boolean ecoff_slurp_armap PARAMS ((bfd *abfd)); -#define ecoff_slurp_extended_name_table _bfd_slurp_extended_name_table -#define ecoff_truncate_arname bfd_dont_truncate_arname -extern boolean ecoff_write_armap PARAMS ((bfd *abfd, unsigned int elength, - struct orl *map, - unsigned int orl_count, - int stridx)); -#define ecoff_openr_next_archived_file bfd_generic_openr_next_archived_file -#define ecoff_generic_stat_arch_elt bfd_generic_stat_arch_elt - -extern long ecoff_get_symtab_upper_bound PARAMS ((bfd *abfd)); -extern long ecoff_get_symtab PARAMS ((bfd *abfd, asymbol **alocation)); -extern asymbol *ecoff_make_empty_symbol PARAMS ((bfd *abfd)); -extern void ecoff_print_symbol PARAMS ((bfd *abfd, PTR filep, - asymbol *symbol, - bfd_print_symbol_type how)); -extern void ecoff_get_symbol_info PARAMS ((bfd *abfd, - asymbol *symbol, - symbol_info *ret)); -#define ecoff_bfd_is_local_label bfd_generic_is_local_label -#define ecoff_get_lineno _bfd_nosymbols_get_lineno -extern boolean ecoff_find_nearest_line PARAMS ((bfd *abfd, - asection *section, - asymbol **symbols, - bfd_vma offset, - CONST char **filename_ptr, - CONST char **fnname_ptr, - unsigned int *retline_ptr)); -#define ecoff_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol - -#define ecoff_get_reloc_upper_bound coff_get_reloc_upper_bound -extern long ecoff_canonicalize_reloc PARAMS ((bfd *abfd, - asection *section, - arelent **relptr, - asymbol **symbols)); +extern boolean _bfd_ecoff_slurp_armap PARAMS ((bfd *abfd)); +#define _bfd_ecoff_slurp_extended_name_table _bfd_slurp_extended_name_table +#define _bfd_ecoff_truncate_arname bfd_dont_truncate_arname +extern boolean _bfd_ecoff_write_armap + PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); +#define _bfd_ecoff_openr_next_archived_file \ + bfd_generic_openr_next_archived_file +#define _bfd_ecoff_generic_stat_arch_elt bfd_generic_stat_arch_elt + +extern long _bfd_ecoff_get_symtab_upper_bound PARAMS ((bfd *abfd)); +extern long _bfd_ecoff_get_symtab PARAMS ((bfd *abfd, asymbol **alocation)); +extern asymbol *_bfd_ecoff_make_empty_symbol PARAMS ((bfd *abfd)); +extern void _bfd_ecoff_print_symbol + PARAMS ((bfd *, PTR filep, asymbol *, bfd_print_symbol_type)); +extern void _bfd_ecoff_get_symbol_info + PARAMS ((bfd *, asymbol *, symbol_info *)); +#define _bfd_ecoff_bfd_is_local_label bfd_generic_is_local_label +#define _bfd_ecoff_get_lineno _bfd_nosymbols_get_lineno +extern boolean _bfd_ecoff_find_nearest_line + PARAMS ((bfd *, asection *, asymbol **, bfd_vma offset, + const char **filename_ptr, const char **fnname_ptr, + unsigned int *retline_ptr)); +#define _bfd_ecoff_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + +#define _bfd_ecoff_get_reloc_upper_bound coff_get_reloc_upper_bound +extern long _bfd_ecoff_canonicalize_reloc + PARAMS ((bfd *, asection *, arelent **, asymbol **symbols)); /* ecoff_bfd_reloc_type_lookup defined by backend. */ -extern boolean ecoff_set_arch_mach PARAMS ((bfd *abfd, - enum bfd_architecture arch, - unsigned long machine)); -extern boolean ecoff_set_section_contents PARAMS ((bfd *abfd, - asection *section, - PTR location, - file_ptr offset, - bfd_size_type count)); +extern boolean _bfd_ecoff_set_arch_mach + PARAMS ((bfd *, enum bfd_architecture, unsigned long machine)); +extern boolean _bfd_ecoff_set_section_contents + PARAMS ((bfd *, asection *, PTR location, file_ptr, bfd_size_type)); -extern int ecoff_sizeof_headers PARAMS ((bfd *abfd, boolean reloc)); +extern int _bfd_ecoff_sizeof_headers PARAMS ((bfd *abfd, boolean reloc)); /* ecoff_bfd_get_relocated_section_contents defined by backend. */ /* ecoff_bfd_relax_section defined by backend. */ -extern struct bfd_link_hash_table *ecoff_bfd_link_hash_table_create +extern struct bfd_link_hash_table *_bfd_ecoff_bfd_link_hash_table_create PARAMS ((bfd *)); -extern boolean ecoff_bfd_link_add_symbols +extern boolean _bfd_ecoff_bfd_link_add_symbols + PARAMS ((bfd *, struct bfd_link_info *)); +extern boolean _bfd_ecoff_bfd_final_link PARAMS ((bfd *, struct bfd_link_info *)); -extern boolean ecoff_bfd_final_link PARAMS ((bfd *, struct bfd_link_info *)); /* Hook functions for the generic COFF section reading code. */ -extern PTR ecoff_mkobject_hook PARAMS ((bfd *, PTR filehdr, PTR aouthdr)); -extern asection *ecoff_make_section_hook PARAMS ((bfd *abfd, char *name)); -#define ecoff_set_alignment_hook \ +extern PTR _bfd_ecoff_mkobject_hook PARAMS ((bfd *, PTR filehdr, PTR aouthdr)); +extern asection *_bfd_ecoff_make_section_hook PARAMS ((bfd *abfd, char *name)); +#define _bfd_ecoff_set_alignment_hook \ ((void (*) PARAMS ((bfd *, asection *, PTR))) bfd_void) -extern boolean ecoff_set_arch_mach_hook PARAMS ((bfd *abfd, PTR filehdr)); -extern long ecoff_sec_to_styp_flags PARAMS ((CONST char *name, - flagword flags)); -extern flagword ecoff_styp_to_sec_flags PARAMS ((bfd *abfd, PTR hdr)); -extern boolean ecoff_slurp_symbol_table PARAMS ((bfd *abfd)); +extern boolean _bfd_ecoff_set_arch_mach_hook PARAMS ((bfd *abfd, PTR filehdr)); +extern flagword _bfd_ecoff_styp_to_sec_flags PARAMS ((bfd *abfd, PTR hdr)); +extern boolean _bfd_ecoff_slurp_symbol_table PARAMS ((bfd *abfd)); -- 2.7.4