From 60b89a18787c3bef019482b96d4735184deea9d0 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 23 Aug 2001 15:45:19 +0000 Subject: [PATCH] 2001-08-23 H.J. Lu * syms.c (bfd_print_symbol_vandf): Add abfd to arg. * bfd-in2.h (bfd_print_symbol_vandf): Regenerated. * aoutx.h (NAME(aout,print_symbol)): Pass abfd to bfd_print_symbol_vandf. * coffgen.c (coff_print_symbol): Likewise. * elf.c (bfd_elf_print_symbol): Likewise. * ieee.c (ieee_print_symbol): Likewise. * nlmcode.h (nlm_print_symbol): Likewise. * oasys.c (oasys_print_symbol): Likewise. * pdp11.c (NAME(aout,print_symbol)): Likewise. * som.c (som_print_symbol): Likewise. * srec.c (srec_print_symbol): Likewise. * tekhex.c (tekhex_print_symbol): Likewise. * versados.c (versados_print_symbol): Likewise. * vms.c (vms_print_symbol): Likewise. * elf.c (_bfd_elf_print_private_bfd_data): Replace fprintf_vma with bfd_fprintf_vma. (bfd_elf_print_symbol): Likewise. * syms.c (bfd_print_symbol_vandf): Likewise. --- bfd/ChangeLog | 24 ++++++++++++++++++++++++ bfd/aoutx.h | 6 +++--- bfd/bfd-in2.h | 2 +- bfd/coffgen.c | 2 +- bfd/elf.c | 22 +++++++++++----------- bfd/ieee.c | 6 +++--- bfd/nlmcode.h | 4 ++-- bfd/oasys.c | 6 +++--- bfd/pdp11.c | 4 ++-- bfd/som.c | 6 +++--- bfd/srec.c | 6 +++--- bfd/syms.c | 10 ++++++---- bfd/tekhex.c | 6 +++--- bfd/versados.c | 6 +++--- bfd/vms.c | 4 ++-- 15 files changed, 70 insertions(+), 44 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index fc01f03371..583d82917c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,27 @@ +2001-08-23 H.J. Lu + + * syms.c (bfd_print_symbol_vandf): Add abfd to arg. + * bfd-in2.h (bfd_print_symbol_vandf): Regenerated. + + * aoutx.h (NAME(aout,print_symbol)): Pass abfd to + bfd_print_symbol_vandf. + * coffgen.c (coff_print_symbol): Likewise. + * elf.c (bfd_elf_print_symbol): Likewise. + * ieee.c (ieee_print_symbol): Likewise. + * nlmcode.h (nlm_print_symbol): Likewise. + * oasys.c (oasys_print_symbol): Likewise. + * pdp11.c (NAME(aout,print_symbol)): Likewise. + * som.c (som_print_symbol): Likewise. + * srec.c (srec_print_symbol): Likewise. + * tekhex.c (tekhex_print_symbol): Likewise. + * versados.c (versados_print_symbol): Likewise. + * vms.c (vms_print_symbol): Likewise. + + * elf.c (_bfd_elf_print_private_bfd_data): Replace fprintf_vma + with bfd_fprintf_vma. + (bfd_elf_print_symbol): Likewise. + * syms.c (bfd_print_symbol_vandf): Likewise. + 2001-08-23 Nick Clifton * aoutf1.h (sunos_write_object_contents): Silence compile time diff --git a/bfd/aoutx.h b/bfd/aoutx.h index e9c1d2fef0..603cac7c86 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -2590,8 +2590,8 @@ NAME(aout,get_symbol_info) (ignore_abfd, symbol, ret) } void -NAME(aout,print_symbol) (ignore_abfd, afile, symbol, how) - bfd *ignore_abfd ATTRIBUTE_UNUSED; +NAME(aout,print_symbol) (abfd, afile, symbol, how) + bfd *abfd; PTR afile; asymbol *symbol; bfd_print_symbol_type how; @@ -2612,7 +2612,7 @@ NAME(aout,print_symbol) (ignore_abfd, afile, symbol, how) { CONST char *section_name = symbol->section->name; - bfd_print_symbol_vandf((PTR)file,symbol); + bfd_print_symbol_vandf (abfd, (PTR)file, symbol); fprintf (file," %-5s %04x %02x %02x", section_name, diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 67881f2c15..4b6f44e40e 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -2945,7 +2945,7 @@ boolean bfd_set_symtab PARAMS ((bfd *abfd, asymbol **location, unsigned int count)); void -bfd_print_symbol_vandf PARAMS ((PTR file, asymbol *symbol)); +bfd_print_symbol_vandf PARAMS ((bfd *abfd, PTR file, asymbol *symbol)); #define bfd_make_empty_symbol(abfd) \ BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd)) diff --git a/bfd/coffgen.c b/bfd/coffgen.c index 533b88998a..45eda875d5 100644 --- a/bfd/coffgen.c +++ b/bfd/coffgen.c @@ -2151,7 +2151,7 @@ coff_print_symbol (abfd, filep, symbol, how) } else { - bfd_print_symbol_vandf ((PTR) file, symbol); + bfd_print_symbol_vandf (abfd, (PTR) file, symbol); fprintf (file, " %-5s %s %s %s", symbol->section->name, coffsymbol (symbol)->native ? "n" : "g", diff --git a/bfd/elf.c b/bfd/elf.c index 1cbb180339..d1aab9e2f9 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -612,16 +612,16 @@ _bfd_elf_print_private_bfd_data (abfd, farg) default: sprintf (buf, "0x%lx", p->p_type); s = buf; break; } fprintf (f, "%8s off 0x", s); - fprintf_vma (f, p->p_offset); + bfd_fprintf_vma (abfd, f, p->p_offset); fprintf (f, " vaddr 0x"); - fprintf_vma (f, p->p_vaddr); + bfd_fprintf_vma (abfd, f, p->p_vaddr); fprintf (f, " paddr 0x"); - fprintf_vma (f, p->p_paddr); + bfd_fprintf_vma (abfd, f, p->p_paddr); fprintf (f, " align 2**%u\n", bfd_log2 (p->p_align)); fprintf (f, " filesz 0x"); - fprintf_vma (f, p->p_filesz); + bfd_fprintf_vma (abfd, f, p->p_filesz); fprintf (f, " memsz 0x"); - fprintf_vma (f, p->p_memsz); + bfd_fprintf_vma (abfd, f, p->p_memsz); fprintf (f, " flags %c%c%c", (p->p_flags & PF_R) != 0 ? 'r' : '-', (p->p_flags & PF_W) != 0 ? 'w' : '-', @@ -830,7 +830,7 @@ bfd_elf_print_symbol (abfd, filep, symbol, how) break; case bfd_print_symbol_more: fprintf (file, "elf "); - fprintf_vma (file, symbol->value); + bfd_fprintf_vma (abfd, file, symbol->value); fprintf (file, " %lx", (long) symbol->flags); break; case bfd_print_symbol_all: @@ -849,7 +849,7 @@ bfd_elf_print_symbol (abfd, filep, symbol, how) if (name == NULL) { name = symbol->name; - bfd_print_symbol_vandf ((PTR) file, symbol); + bfd_print_symbol_vandf (abfd, (PTR) file, symbol); } fprintf (file, " %s\t", section_name); @@ -857,10 +857,10 @@ bfd_elf_print_symbol (abfd, filep, symbol, how) we've already printed the size; now print the alignment. For other symbols, we have no specified alignment, and we've printed the address; now print the size. */ - fprintf_vma (file, - (bfd_is_com_section (symbol->section) - ? ((elf_symbol_type *) symbol)->internal_elf_sym.st_value - : ((elf_symbol_type *) symbol)->internal_elf_sym.st_size)); + bfd_fprintf_vma (abfd, file, + (bfd_is_com_section (symbol->section) + ? ((elf_symbol_type *) symbol)->internal_elf_sym.st_value + : ((elf_symbol_type *) symbol)->internal_elf_sym.st_size)); /* If we have version information, print it. */ if (elf_tdata (abfd)->dynversym_section != 0 diff --git a/bfd/ieee.c b/bfd/ieee.c index 2a21b262af..f49ee53bbd 100644 --- a/bfd/ieee.c +++ b/bfd/ieee.c @@ -1745,8 +1745,8 @@ ieee_get_symbol_info (ignore_abfd, symbol, ret) } static void -ieee_print_symbol (ignore_abfd, afile, symbol, how) - bfd *ignore_abfd ATTRIBUTE_UNUSED; +ieee_print_symbol (abfd, afile, symbol, how) + bfd *abfd; PTR afile; asymbol *symbol; bfd_print_symbol_type how; @@ -1777,7 +1777,7 @@ ieee_print_symbol (ignore_abfd, afile, symbol, how) } else { - bfd_print_symbol_vandf ((PTR) file, symbol); + bfd_print_symbol_vandf (abfd, (PTR) file, symbol); fprintf (file, " %-5s %04x %02x %s", section_name, diff --git a/bfd/nlmcode.h b/bfd/nlmcode.h index 04ba2a0281..0dce9439f5 100644 --- a/bfd/nlmcode.h +++ b/bfd/nlmcode.h @@ -981,7 +981,7 @@ nlm_get_symbol_info (ignore_abfd, symbol, ret) void nlm_print_symbol (abfd, afile, symbol, how) - bfd *abfd ATTRIBUTE_UNUSED; + bfd *abfd; PTR afile; asymbol *symbol; bfd_print_symbol_type how; @@ -996,7 +996,7 @@ nlm_print_symbol (abfd, afile, symbol, how) fprintf (file, "%s", symbol->name); break; case bfd_print_symbol_all: - bfd_print_symbol_vandf ((PTR) file, symbol); + bfd_print_symbol_vandf (abfd, (PTR) file, symbol); fprintf (file, " %-5s", symbol->section->name); if (symbol->name) fprintf (file, " %s", symbol->name); diff --git a/bfd/oasys.c b/bfd/oasys.c index 0b2f88da68..12cefc7362 100644 --- a/bfd/oasys.c +++ b/bfd/oasys.c @@ -517,8 +517,8 @@ oasys_get_symbol_info (ignore_abfd, symbol, ret) } static void -oasys_print_symbol (ignore_abfd, afile, symbol, how) - bfd *ignore_abfd ATTRIBUTE_UNUSED; +oasys_print_symbol (abfd, afile, symbol, how) + bfd *abfd; PTR afile; asymbol *symbol; bfd_print_symbol_type how; @@ -536,7 +536,7 @@ oasys_print_symbol (ignore_abfd, afile, symbol, how) CONST char *section_name = symbol->section == (asection *) NULL ? (CONST char *) "*abs" : symbol->section->name; - bfd_print_symbol_vandf ((PTR) file, symbol); + bfd_print_symbol_vandf (abfd, (PTR) file, symbol); fprintf (file, " %-5s %s", section_name, diff --git a/bfd/pdp11.c b/bfd/pdp11.c index c7e9c3cea8..3b60b034be 100644 --- a/bfd/pdp11.c +++ b/bfd/pdp11.c @@ -2461,7 +2461,7 @@ NAME(aout,get_symbol_info) (abfd, symbol, ret) /*ARGSUSED*/ void NAME(aout,print_symbol) (abfd, afile, symbol, how) - bfd * abfd ATTRIBUTE_UNUSED; + bfd * abfd; PTR afile; asymbol *symbol; bfd_print_symbol_type how; @@ -2483,7 +2483,7 @@ NAME(aout,print_symbol) (abfd, afile, symbol, how) { CONST char *section_name = symbol->section->name; - bfd_print_symbol_vandf ((PTR)file,symbol); + bfd_print_symbol_vandf (abfd, (PTR)file, symbol); fprintf (file," %-5s %04x %02x %02x", section_name, diff --git a/bfd/som.c b/bfd/som.c index f92b7a0aa7..1b877d5f26 100644 --- a/bfd/som.c +++ b/bfd/som.c @@ -4499,8 +4499,8 @@ som_make_empty_symbol (abfd) /* Print symbol information. */ static void -som_print_symbol (ignore_abfd, afile, symbol, how) - bfd *ignore_abfd ATTRIBUTE_UNUSED; +som_print_symbol (abfd, afile, symbol, how) + bfd *abfd; PTR afile; asymbol *symbol; bfd_print_symbol_type how; @@ -4520,7 +4520,7 @@ som_print_symbol (ignore_abfd, afile, symbol, how) { CONST char *section_name; section_name = symbol->section ? symbol->section->name : "(*none*)"; - bfd_print_symbol_vandf ((PTR) file, symbol); + bfd_print_symbol_vandf (abfd, (PTR) file, symbol); fprintf (file, " %s\t%s", section_name, symbol->name); break; } diff --git a/bfd/srec.c b/bfd/srec.c index 43ac9a57c7..5c6ef82dda 100644 --- a/bfd/srec.c +++ b/bfd/srec.c @@ -1217,8 +1217,8 @@ srec_get_symbol_info (ignore_abfd, symbol, ret) } static void -srec_print_symbol (ignore_abfd, afile, symbol, how) - bfd *ignore_abfd ATTRIBUTE_UNUSED; +srec_print_symbol (abfd, afile, symbol, how) + bfd *abfd; PTR afile; asymbol *symbol; bfd_print_symbol_type how; @@ -1230,7 +1230,7 @@ srec_print_symbol (ignore_abfd, afile, symbol, how) fprintf (file, "%s", symbol->name); break; default: - bfd_print_symbol_vandf ((PTR) file, symbol); + bfd_print_symbol_vandf (abfd, (PTR) file, symbol); fprintf (file, " %-5s %s", symbol->section->name, symbol->name); diff --git a/bfd/syms.c b/bfd/syms.c index 27303b1e0a..5d885a467a 100644 --- a/bfd/syms.c +++ b/bfd/syms.c @@ -433,14 +433,15 @@ FUNCTION bfd_print_symbol_vandf SYNOPSIS - void bfd_print_symbol_vandf(PTR file, asymbol *symbol); + void bfd_print_symbol_vandf(bfd *abfd, PTR file, asymbol *symbol); DESCRIPTION Print the value and flags of the @var{symbol} supplied to the stream @var{file}. */ void -bfd_print_symbol_vandf (arg, symbol) +bfd_print_symbol_vandf (abfd, arg, symbol) + bfd *abfd; PTR arg; asymbol *symbol; { @@ -448,11 +449,12 @@ bfd_print_symbol_vandf (arg, symbol) flagword type = symbol->flags; if (symbol->section != (asection *) NULL) { - fprintf_vma (file, symbol->value + symbol->section->vma); + bfd_fprintf_vma (abfd, file, + symbol->value + symbol->section->vma); } else { - fprintf_vma (file, symbol->value); + bfd_fprintf_vma (abfd, file, symbol->value); } /* This presumes that a symbol can not be both BSF_DEBUGGING and diff --git a/bfd/tekhex.c b/bfd/tekhex.c index 13ce00ebec..943992bf76 100644 --- a/bfd/tekhex.c +++ b/bfd/tekhex.c @@ -957,8 +957,8 @@ tekhex_get_symbol_info (ignore_abfd, symbol, ret) } static void -tekhex_print_symbol (ignore_abfd, filep, symbol, how) - bfd *ignore_abfd ATTRIBUTE_UNUSED; +tekhex_print_symbol (abfd, filep, symbol, how) + bfd *abfd; PTR filep; asymbol *symbol; bfd_print_symbol_type how; @@ -977,7 +977,7 @@ tekhex_print_symbol (ignore_abfd, filep, symbol, how) { CONST char *section_name = symbol->section->name; - bfd_print_symbol_vandf ((PTR) file, symbol); + bfd_print_symbol_vandf (abfd, (PTR) file, symbol); fprintf (file, " %-5s %s", section_name, diff --git a/bfd/versados.c b/bfd/versados.c index e281d71b18..b8d71e5539 100644 --- a/bfd/versados.c +++ b/bfd/versados.c @@ -742,8 +742,8 @@ versados_get_symbol_info (ignore_abfd, symbol, ret) } void -versados_print_symbol (ignore_abfd, afile, symbol, how) - bfd *ignore_abfd ATTRIBUTE_UNUSED; +versados_print_symbol (abfd, afile, symbol, how) + bfd *abfd; PTR afile; asymbol *symbol; bfd_print_symbol_type how; @@ -755,7 +755,7 @@ versados_print_symbol (ignore_abfd, afile, symbol, how) fprintf (file, "%s", symbol->name); break; default: - bfd_print_symbol_vandf ((PTR) file, symbol); + bfd_print_symbol_vandf (abfd, (PTR) file, symbol); fprintf (file, " %-5s %s", symbol->section->name, symbol->name); diff --git a/bfd/vms.c b/bfd/vms.c index add9c2cebc..78c31c2a6c 100644 --- a/bfd/vms.c +++ b/bfd/vms.c @@ -1170,7 +1170,7 @@ _bfd_vms_make_empty_symbol (abfd) static void vms_print_symbol (abfd, file, symbol, how) - bfd *abfd ATTRIBUTE_UNUSED; + bfd *abfd; PTR file; asymbol *symbol; bfd_print_symbol_type how; @@ -1190,7 +1190,7 @@ vms_print_symbol (abfd, file, symbol, how) { CONST char *section_name = symbol->section->name; - bfd_print_symbol_vandf((PTR)file,symbol); + bfd_print_symbol_vandf (abfd, (PTR)file, symbol); fprintf ((FILE *)file," %-8s %s", section_name, symbol->name); }