diff options
author | Alan Modra <amodra@gmail.com> | 2004-08-13 03:16:01 +0000 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2004-08-13 03:16:01 +0000 |
commit | d003868ea7bfa700dd91cbb6198b75f341a456e7 (patch) | |
tree | 882a8d422287b46bb82ee553029f2f5d3343adff /ld | |
parent | 1bd654d82c5f6fa2c793c469053da2ac358846db (diff) | |
download | fsf-binutils-gdb-d003868ea7bfa700dd91cbb6198b75f341a456e7.zip fsf-binutils-gdb-d003868ea7bfa700dd91cbb6198b75f341a456e7.tar.gz fsf-binutils-gdb-d003868ea7bfa700dd91cbb6198b75f341a456e7.tar.bz2 |
bfd/
* bfd.c (_bfd_default_error_handler): Handle %A and %B.
(bfd_archive_filename, bfd_get_section_ident): Delete.
* ecofflink.c (bfd_ecoff_debug_accumulate_other): Don't call
bfd_archive_filename.
* elflink.c (elf_link_input_bfd): Don't use callbacks->error_handler
to warn about symbols in discarded sections. Use _bfd_error_handler.
* aout-adobe.c (aout_adobe_callback): See below.
* aout-cris.c (swap_ext_reloc_in): ..
* coff-arm.c (find_thumb_glue, find_arm_glue,
coff_arm_relocate_section, bfd_arm_process_before_allocation,
coff_arm_merge_private_bfd_data, _bfd_coff_arm_set_private_flags,
coff_arm_copy_private_bfd_data): ..
* coff-i860.c (i860_reloc_processing): ..
* coff-mcore.c (mcore_coff_unsupported_reloc,
coff_mcore_relocate_section): ..
* coff-ppc.c (coff_ppc_relocate_section): ..
* coff-rs6000.c (xcoff_create_csect_from_smclas
* coff-sh.c (sh_relax_section, sh_relax_delete_bytes,
sh_swap_insns, sh_relocate_section): ..
* coff-tic54x.c (tic54x_reloc_processing): ..
* coff-tic80.c (coff_tic80_relocate_section): ..
* coff64-rs6000.c (xcoff64_create_csect_from_smclas): ..
* coffcode.h (styp_to_sec_flags, coff_slurp_line_table,
coff_slurp_symbol_table, coff_classify_symbol,
coff_slurp_reloc_table): ..
* coffgen.c (_bfd_coff_read_string_table): ..
* cofflink.c (coff_link_add_symbols, _bfd_coff_link_input_bfd,
_bfd_coff_generic_relocate_section): ..
* cpu-arm.c (bfd_arm_merge_machines): ..
* cpu-sh.c (sh_merge_bfd_arch): ..
* elf-hppa.h (elf_hppa_relocate_section): ..
* elf.c (bfd_elf_string_from_elf_section, setup_group,
_bfd_elf_setup_group_pointers, bfd_section_from_shdr,
assign_section_numbers, _bfd_elf_symbol_from_bfd_symbol,
copy_private_bfd_data, _bfd_elf_validate_reloc): ..
* elf32-arm.h (find_thumb_glue, find_arm_glue,
bfd_elf32_arm_process_before_allocation, elf32_thumb_to_arm_stub,
elf32_arm_to_thumb_stub, elf32_arm_final_link_relocate,
elf32_arm_relocate_section, elf32_arm_set_private_flags,
elf32_arm_copy_private_bfd_data, elf32_arm_merge_private_bfd_data): ..
* elf32-cris.c (cris_elf_relocate_section, cris_elf_check_relocs,
cris_elf_merge_private_bfd_data
* elf32-frv.c (elf32_frv_relocate_section, elf32_frv_check_relocs): ..
* elf32-gen.c (elf32_generic_link_add_symbols): ..
* elf32-hppa.c (hppa_add_stub, hppa_build_one_stub,
elf32_hppa_check_relocs, get_local_syms, final_link_relocate,
elf32_hppa_relocate_section): ..
* elf32-i370.c (i370_elf_merge_private_bfd_data,
i370_elf_check_relocs, i370_elf_relocate_section): ..
* elf32-i386.c (elf_i386_info_to_howto_rel, elf_i386_check_relocs,
elf_i386_relocate_section): ..
* elf32-m32r.c (m32r_elf_relocate_section,
m32r_elf_merge_private_bfd_data): ..
* elf32-m68hc1x.c (m68hc12_add_stub,
_bfd_m68hc11_elf_merge_private_bfd_data): ..
* elf32-m68k.c (elf_m68k_relocate_section): ..
* elf32-mcore.c (mcore_elf_unsupported_reloc,
mcore_elf_relocate_section): ..
* elf32-ppc.c (ppc_elf_merge_private_bfd_data, bad_shared_reloc,
ppc_elf_check_relocs, ppc_elf_relocate_section,
ppc_elf_begin_write_processing): ..
* elf32-s390.c (elf_s390_check_relocs, invalid_tls_insn,
elf_s390_relocate_section): ..
* elf32-sh-symbian.c (sh_symbian_import_as,
sh_symbian_process_embedded_commands,
sh_symbian_relocate_section): ..
* elf32-sh.c (sh_elf_relax_section, sh_elf_relax_delete_bytes,
sh_elf_swap_insns, sh_elf_relocate_section, sh_elf_check_relocs,
sh_elf_merge_private_data): ..
* elf32-sparc.c (elf32_sparc_check_relocs,
elf32_sparc_relocate_section,
elf32_sparc_merge_private_bfd_data): ..
* elf32-v850.c (v850_elf_check_relocs,
v850_elf_merge_private_bfd_data): ..
* elf32-xtensa.c (elf_xtensa_check_relocs,
elf_xtensa_relocate_section, elf_xtensa_merge_private_bfd_data): ..
* elf64-alpha.c (elf64_alpha_relax_with_lituse,
elf64_alpha_relax_got_load, elf64_alpha_size_got_sections,
elf64_alpha_relocate_section_r, elf64_alpha_relocate_section): ..
* elf64-gen.c (elf64_generic_link_add_symbols): ..
* elf64-ppc.c (ppc64_elf_merge_private_bfd_data, ppc_add_stub,
ppc64_elf_check_relocs, ppc64_elf_edit_opd,
ppc64_elf_relocate_section): ..
* elf64-s390.c (elf_s390_check_relocs, invalid_tls_insn,
elf_s390_relocate_section): ..
* elf64-sh64.c (sh_elf64_relocate_section): ..
* elf64-sparc.c (sparc64_elf_check_relocs,
sparc64_elf_add_symbol_hook, sparc64_elf_relocate_section,
sparc64_elf_merge_private_bfd_data): ..
* elf64-x86-64.c (elf64_x86_64_check_relocs,
elf64_x86_64_relocate_section): ..
* elflink.c (_bfd_elf_add_default_symbol,
_bfd_elf_link_assign_sym_version, elf_link_read_relocs_from_section,
_bfd_elf_link_output_relocs, elf_link_add_object_symbols,
bfd_elf_size_dynamic_sections, elf_link_output_extsym,
elf_get_linked_section_vma, elf_fixup_link_order,
bfd_elf_final_link, bfd_elf_gc_record_vtinherit,
bfd_elf_gc_record_vtinherit, _bfd_elf_section_already_linked): ..
* elfxx-ia64.c (elfNN_ia64_relax_section,
elfNN_ia64_relocate_section, elfNN_ia64_merge_private_bfd_data): ..
* elfxx-mips.c (mips_elf_perform_relocation,
_bfd_mips_elf_check_relocs,
_bfd_mips_elf_merge_private_bfd_data): ..
* ieee.c (ieee_slurp_external_symbols): ..
* ihex.c (ihex_bad_byte, ihex_scan, ihex_read_section): ..
* libbfd.c (_bfd_generic_verify_endian_match): ..
* linker.c (_bfd_generic_link_add_one_symbol,
_bfd_generic_section_already_linked): ..
* pdp11.c (translate_to_native_sym_flags): ..
* pe-mips.c (coff_pe_mips_relocate_section): ..
* peicode.h (pe_ILF_build_a_bfd): ..
* srec.c (srec_bad_byte): ..
* stabs.c (_bfd_link_section_stabs): ..
* xcofflink.c (xcoff_link_add_symbols, xcoff_link_input_bfd): ..
Replace all uses of bfd_archive_filename and bfd_get_section_ident
with corresponding %B and %A in _bfd_error_handler format string.
Replace occurrences of "fprintf (stderr," with _bfd_error_handler
calls to use %A and %B. Fix "against symbol .. from section" and
similar error messages. Combine multiple _bfd_error_handler calls
where they were separated due to bfd_archive_filename deficiencies.
* bfd-in2.h: Regenerate.
include/
* bfdlink.h (struct bfd_link_callbacks): Remove "error_handler".
(LD_DEFINITION_IN_DISCARDED_SECTION): Delete.
ld/
* ldmain.c (link_callbacks): Remove "error_handler".
* ldmisc.c: Include elf-bfd.h.
(vfinfo): Sort comment. Handle %A. Use %A instead of
bfd_get_section_indent.
(error_handler): Delete.
* ldmisc.h (error_handler): Delete declaration.
Diffstat (limited to 'ld')
-rw-r--r-- | ld/ChangeLog | 9 | ||||
-rw-r--r-- | ld/ldmain.c | 3 | ||||
-rw-r--r-- | ld/ldmisc.c | 118 | ||||
-rw-r--r-- | ld/ldmisc.h | 3 |
4 files changed, 50 insertions, 83 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 374d8ce..d9aa177 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2004-08-13 Alan Modra <amodra@bigpond.net.au> + + * ldmain.c (link_callbacks): Remove "error_handler". + * ldmisc.c: Include elf-bfd.h. + (vfinfo): Sort comment. Handle %A. Use %A instead of + bfd_get_section_indent. + (error_handler): Delete. + * ldmisc.h (error_handler): Delete declaration. + 2004-08-10 Alan Modra <amodra@bigpond.net.au> * emultempl/ppc64elf.em (gld${EMULATION_NAME}_finish): Call diff --git a/ld/ldmain.c b/ld/ldmain.c index 193fd69..4575221 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -156,8 +156,7 @@ static struct bfd_link_callbacks link_callbacks = reloc_overflow, reloc_dangerous, unattached_reloc, - notice, - error_handler + notice }; struct bfd_link_info link_info; diff --git a/ld/ldmisc.c b/ld/ldmisc.c index 3e8b371..5f7d0e9 100644 --- a/ld/ldmisc.c +++ b/ld/ldmisc.c @@ -1,6 +1,6 @@ /* ldmisc.c - Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2002, 2003 + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2002, 2003, 2004 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support. @@ -35,27 +35,29 @@ #include "ldlex.h" #include "ldmain.h" #include "ldfile.h" +#include "elf-bfd.h" /* %% literal % + %A section name from a section + %B filename from a bfd + %C clever filename:linenumber with function + %D like %C, but no function name + %E current bfd error or errno %F error is fatal + %G like %D, but only function name + %I filename from a lang_input_statement_type %P print program name + %R info about a relent %S print script file and linenumber - %E current bfd error or errno - %I filename from a lang_input_statement_type - %B filename from a bfd %T symbol name - %X no object output, fail return %V hex bfd_vma - %v hex bfd_vma, no leading zeros %W hex bfd_vma with 0x with no leading zeros taking up 8 spaces - %C clever filename:linenumber with function - %D like %C, but no function name - %G like %D, but only function name - %R info about a relent - %s arbitrary string, like printf + %X no object output, fail return %d integer, like printf + %s arbitrary string, like printf %u integer, like printf + %v hex bfd_vma, no leading zeros */ static void @@ -158,6 +160,30 @@ vfinfo (FILE *fp, const char *fmt, va_list arg) } break; + case 'A': + /* section name from a section */ + { + asection *sec = va_arg (arg, asection *); + bfd *abfd = sec->owner; + const char *group = NULL; + struct coff_comdat_info *ci; + + fprintf (fp, "%s", sec->name); + if (abfd != NULL + && bfd_get_flavour (abfd) == bfd_target_elf_flavour + && elf_next_in_group (sec) != NULL + && (sec->flags & SEC_GROUP) == 0) + group = elf_group_name (sec); + else if (abfd != NULL + && bfd_get_flavour (abfd) == bfd_target_coff_flavour + && (ci = bfd_coff_get_comdat_section (sec->owner, + sec)) != NULL) + group = ci->name; + if (group != NULL) + fprintf (fp, "[%s]", group); + } + break; + case 'B': /* filename from a bfd */ { @@ -241,7 +267,6 @@ vfinfo (FILE *fp, const char *fmt, va_list arg) const char *functionname; unsigned int linenumber; bfd_boolean discard_last; - char *sec_name; abfd = va_arg (arg, bfd *); section = va_arg (arg, asection *); @@ -270,11 +295,7 @@ vfinfo (FILE *fp, const char *fmt, va_list arg) } } - sec_name = bfd_get_section_ident (section); - lfinfo (fp, "%B(%s+0x%v)", abfd, - sec_name ? sec_name : section->name, offset); - if (sec_name) - free (sec_name); + lfinfo (fp, "%B(%A+0x%v)", abfd, section, offset); discard_last = TRUE; if (bfd_find_nearest_line (abfd, section, asymbols, offset, @@ -494,64 +515,3 @@ ld_abort (const char *file, int line, const char *fn) einfo (_("%P%F: please report this bug\n")); xexit (1); } - -bfd_boolean -error_handler (int id, const char *fmt, ...) -{ - va_list arg; - - va_start (arg, fmt); - - switch (id) - { - default: - break; - - /* We can be called with - - error_handler (-LD_DEFINITION_IN_DISCARDED_SECTION, "", 0); - - to make this error non-fatal and - - error_handler (-LD_DEFINITION_IN_DISCARDED_SECTION, "", 1); - - to make this error fatal. */ - case -LD_DEFINITION_IN_DISCARDED_SECTION: - case LD_DEFINITION_IN_DISCARDED_SECTION: - { - static struct bfd_hash_table *hash; - static int fatal = 1; - const char *name; - - if (id == -LD_DEFINITION_IN_DISCARDED_SECTION) - { - fatal = va_arg (arg, int); - goto out; - } - - name = va_arg (arg, const char *); - /* Only warn once about a particular undefined symbol. */ - if (hash == NULL) - { - hash = xmalloc (sizeof (struct bfd_hash_table)); - if (! bfd_hash_table_init (hash, bfd_hash_newfunc)) - einfo (_("%F%P: bfd_hash_table_init failed: %E\n")); - } - - if (bfd_hash_lookup (hash, name, FALSE, FALSE) != NULL) - goto out; - - if (bfd_hash_lookup (hash, name, TRUE, TRUE) == NULL) - einfo (_("%F%P: bfd_hash_lookup failed: %E\n")); - - if (fatal) - config.make_executable = FALSE; - } - break; - } - vfinfo (stderr, fmt, arg); - -out: - va_end (arg); - return TRUE; -} diff --git a/ld/ldmisc.h b/ld/ldmisc.h index b2812fb..0b1a6ea 100644 --- a/ld/ldmisc.h +++ b/ld/ldmisc.h @@ -1,5 +1,5 @@ /* ldmisc.h - - Copyright 1991, 1992, 1993, 1994, 1996, 1997, 2001, 2003 + Copyright 1991, 1992, 1993, 1994, 1996, 1997, 2001, 2003, 2004 Free Software Foundation, Inc. This file is part of GLD, the Gnu Linker. @@ -22,7 +22,6 @@ #ifndef LDMISC_H #define LDMISC_H -extern bfd_boolean error_handler (int, const char *, ...); extern void einfo (const char *, ...); extern void minfo (const char *, ...); extern void info_msg (const char *, ...); |