Changeset 609 for branches/GNU/src/binutils/gprof

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

Location:

branches/GNU/src/binutils/gprof

Files:

• ChangeLog (modified) (9 diffs, 1 prop)
• Makefile.am (modified) (5 diffs, 1 prop)
• Makefile.in (modified) (12 diffs, 1 prop)
• TODO (modified) (1 diff, 1 prop)
• aclocal.m4 (modified) (7 diffs, 1 prop)
• alpha.c (modified) (6 diffs, 1 prop)
• basic_blocks.c (modified) (15 diffs, 1 prop)
• basic_blocks.h (modified) (2 diffs, 1 prop)
• bsd_callg_bl.c (modified) (1 diff, 1 prop)
• call_graph.c (modified) (5 diffs, 1 prop)
• call_graph.h (modified) (1 diff, 1 prop)
• cg_arcs.c (modified) (12 diffs, 1 prop)
• cg_arcs.h (modified) (1 diff, 1 prop)
• cg_dfn.c (modified) (8 diffs, 1 prop)
• cg_print.c (modified) (35 diffs, 1 prop)
• cg_print.h (modified) (1 diff, 1 prop)
• configure (modified) (148 diffs, 1 prop)
• configure.in (modified) (2 diffs, 1 prop)
• corefile.c (modified) (22 diffs, 1 prop)
• corefile.h (modified) (2 diffs, 1 prop)
• dep-in.sed (modified) (1 diff, 1 prop)
• flat_bl.c (modified) (1 diff, 1 prop)
• fsf_callg_bl.c (modified) (1 diff, 1 prop)
• gconfig.in (modified) (3 diffs, 1 prop)
• gen-c-prog.awk (modified) (2 diffs, 1 prop)
• gmon.h (modified) (4 diffs, 1 prop)
• gmon_io.c (modified) (18 diffs, 1 prop)
• gmon_io.h (modified) (3 diffs, 1 prop)
• gmon_out.h (modified) (1 diff, 1 prop)
• gprof.1 (modified) (2 diffs, 1 prop)
• gprof.c (modified) (7 diffs, 1 prop)
• gprof.h (modified) (4 diffs, 1 prop)
• gprof.info (modified) (2 diffs, 1 prop)
• gprof.info-1 (modified) (3 diffs, 1 prop)
• gprof.info-2 (modified) (3 diffs, 1 prop)
• gprof.info-3 (modified) (2 diffs, 1 prop)
• gprof.texi (modified) (9 diffs, 1 prop)
• hertz.c (modified) (1 diff, 1 prop)
• hertz.h (modified) (1 diff, 1 prop)
• hist.c (modified) (12 diffs, 1 prop)
• hist.h (modified) (1 diff, 1 prop)
• i386.c (modified) (4 diffs, 1 prop)
• po/Make-in (modified) (1 diff, 1 prop)
• po/POTFILES.in (modified) (1 diff, 1 prop)
• po/gprof.pot (modified) (20 diffs, 1 prop)
• search_list.c (modified) (2 diffs, 1 prop)
• source.c (modified) (5 diffs, 1 prop)
• source.h (modified) (4 diffs, 1 prop)
• sparc.c (modified) (4 diffs, 1 prop)
• sym_ids.c (modified) (13 diffs, 1 prop)
• sym_ids.h (modified) (3 diffs, 1 prop)
• symtab.c (modified) (11 diffs, 1 prop)
• symtab.h (modified) (5 diffs, 1 prop)
• tahoe.c (modified) (9 diffs, 1 prop)
• utils.c (modified) (3 diffs, 1 prop)
• vax.c (modified) (13 diffs, 1 prop)

branches/GNU/src/binutils/gprof/ChangeLog

@@ -1 @@
-2001-06-11  Alan Modra  <amodra@bigpond.net.au>
-
-        Merge from mainline.
-        2001-05-16  Alexandre Oliva  <aoliva@redhat.com>
+2003-03-27  Chris Demetriou  <cgd@broadcom.com>
+
+        * gmon_io.c (enum gmon_ptr_size, enum gmon_ptr_signedness): New.
+        (gmon_get_ptr_size, gmon_get_ptr_signedness): New.
+        (gmon_io_read_vma, gmon_io_write_vma, gmon_read_raw_arc)
+        (gmon_write_raw_arc, gmon_out_read, gmon_out_write): Adjust to
+        use new functions and enums.
+
+2003-02-21  K Schutte  <schutte@fel.tno.nl>
+
+        * corefile.c (core_create_line_syms): Check for a NULL sentinel
+        value before using it.
+
+2002-12-02  Nick Clifton  <nickc@redhat.com>
+
+        * configure.in (LINGUAS): Add pt_BR.
+        * configure: Regenerate.
+        * po/pt_BR: New Brazillian Portugese translation.
+
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+        * basic_blocks.c, basic_blocks.h, cg_arcs.c, cg_dfn.c, cg_print.c,
+        corefile.c, gmon_io.c, gprof.c, gprof.h, hist.c, mips.c, source.c,
+        source.h, sym_ids.c, sym_ids.h, symtab.h, tahoe.c, vax.c: Replace
+        boolean with bfd_boolean, true with TRUE, false with FALSE.
+        Formatting.
+
+2002-11-12  Nick Clifton  <nickc@redhat.com>
+
+        * configure.in (ALL_LINGUAS): Add da.
+        * configure: Regenerate.
+        * po/da.po: New Danish translation.
+
+2002-08-22  Nick Clifton  <nickc@redhat.com>
+
+        * gprof.c (main): Turn off default excluded functions in FLAT
+        profile.
+
+2002-08-21  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+        * gmon_io.c (gmon_io_read_64, gmon_io_write_64): Define only if
+        BFD_HOST_U_64_BIT is defined.
+        (gmon_io_read_vma, gmon_io_write_vma): Add ifdefs.
+
+2002-07-30  Nick Clifton  <nickc@redhat.com>
+
+        * po/tr.po: Updated Turkish translation.
+
+2002-07-30  Nick Clifton  <nickc@redhat.com>
+
+        * alpha.c, cg_arcs.c, cg_dfn.c, gmon.h, gprof.c, gprof.h, hertz.c,
+        i386.c, mips.c, sparc.c, tahoe.c, utils.c, vax.c: Update Copyright
+        notice so that it applies even if the sources are modified.
+
+2002-07-29  Ulrich Drepper  <drepper@redhat.com>
+
+        * gprof.texi (Executing the Program): Add documentation on how to use
+        bbconv.pl.  Patch by Eric Hanchrow.
+
+2002-07-25  Nick Clifton  <nickc@redhat.com>
+
+        * po/es.po: Updated Spanish translation.
+        * po/fr.po: Updated French translation.
+
+2002-07-24  Dave Brolley  <brolley@redhat.com>
+
+        * corefile.c (core_create_function_syms): Use the end of the section
+        containing the symbol to compute max_vma.
+
+2002-07-24  Nick Clifton  <nickc@redhat.com>
+
+        * po/sv.po: Updated Swedish translation.
+        * po/es.po: Updated Spanish translation.
+
+2002-07-23  Nick Clifton  <nickc@redhat.com>
+
+        * po/fr.po: Updated French translation.
+        * po/id.po: New Indonesian translation.
+        * configure.in (LINGUAS): Add id.
+        * configure: Regenerate.
+
+2002-05-02  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * po/Make-in (.po.gmo): Do not attempt to create a .gmo file if
+        the sources are read-only.
+
+2002-04-04  Alan Modra  <amodra@bigpond.net.au>
+
+        * dep-in.sed: Cope with absolute paths.
+        * Makefile.am (dep.sed): Subst TOPDIR.
+        Run "make dep-am".
+        * Makefile.in: Regenerate.
+
+2002-03-21  Alan Modra  <amodra@bigpond.net.au>
+
+        * Makefile.am: Run "make dep-am".
+        * Makefile.in: Regenerate.
+
+2002-03-18  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * po/fr.po: Updated version.
+
+2002-03-13  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * po/fr.po: Updated version.
+
+2002-03-07  Daniel Jacobowitz  <drow@mvista.com>
+
+        * gprof.texi: Wrap @menu in @ifnottex, not @ifinfo.
+
+2002-02-19  Frank Ch. Eigler  <fche@redhat.com>
+
+        * hist.c (hist_print): Rewrite log_scale calculation loop.
+
+2002-02-11  Alan Modra  <amodra@bigpond.net.au>
+
+        * Makefile.am: "make dep-am".
+        * Makefile.in: Regenerate.
+
+2002-02-10  Daniel Jacobowitz  <drow@mvista.com>
+
+        * gprof.c: Include "getopt.h" after other includes, so that
+        the proper macros are defined.
+        * gen-c-prog.awk: Emit a prototype for the generated function.
+
+2002-02-01  Alan Modra  <amodra@bigpond.net.au>
+
+        * configure.in (build_warnings): Add -Wstrict-prototypes
+        -Wmissing-prototypes.
+        * aclocal.m4: Regenerate.
+        * gconfig.in: Regenerate.
+        * configure: Regenerate.
+        * Makefile.am: Run "make dep-am".
+        * Makefile.in: Regenerate.
+
+        * alpha.c (alpha_find_call): Warning fixes.
+        * mips.c (mips_find_call): Likewise.
+        * sparc.c (sparc_find_call): Likewise.
+        * basic_blocks.c: Warning fixes.  Eliminate DEFUN.
+        * call_graph.c: Likewise.
+        * cg_arcs.c: Likewise.
+        * cg_dfn.cp: Likewise.
+        * gprof.c: Likewise.
+        * gprof.h: Likewise.
+        * hist.c: Likewise.
+        * search_list.c: Likewise.
+        * source.c: Likewise.
+        * source.h: Likewise.
+        * sym_ids.c: Likewise.
+        * symtab.c: Likewise.
+        * symtab.h: Likewise.
+        * utils.c: Likewise.
+        * cg_print.c: Likewise.
+        (struct function_map, symbol_map, symbol_map_count): Move
+        declaration to..
+        * corefile: ..here.
+        * corefile.c: Warning fixes.  Eliminate DEFUN.
+        (struct function_map): Remove declaration.
+        * gmon_io.c: Warning fixes.  Eliminate DEFUN.
+        (gmon_io_read_64): Make static.
+        (gmon_io_write_64): Likewise.
+        (gmon_read_raw_arc): Likewise.
+        (gmon_write_raw_arc): Likewise.
+        (gmon_io_write_8): Don't pass char, pass int param.
+        * gmon_io.h (gmon_io_write_8): Likewise.
+
+        * Makefile.am: Run "make dep-am"
+        * Makefile.in: Regenerate.
+
+        * basic_blocks.c: Replace bool with boolean, TRUE with true and
+        FALSE with false throughout.
+        * basic_blocks.h: Likewise.
+        * cg_arcs.c: Likewise.
+        * cg_dfn.c: Likewise.
+        * cg_print.c: Likewise.
+        * corefile.c: Likewise.
+        * gmon_io.c: Likewise.
+        * gprof.c: Likewise.
+        * hist.c: Likewise.
+        * mips.c: Likewise.
+        * source.c: Likewise.
+        * source.h: Likewise.
+        * sym_ids.c: Likewise.
+        * sym_ids.h: Likewise.
+        * symtab.h: Likewise.
+        * tahoe.c: Likewise.
+        * vax.c: Likewise.
+        * gprof.h: Likewise.
+        (TRUE): Don't define.
+        (FALSE): Don't define.
+
+2002-01-31  Jason R Thorpe <thorpej@wasabisystems.com>
+
+        * TODO: Remove "host architecture pointer size" item.
+        * acconfig.h: Remove.
+        * gconfig.in: Regenerate.
+        * configure.in: Remove check for gmon pointer size.
+        * configure: Regenerate.
+        * gmon.h (GMON_HDRSIZE_BSD44_32): Define.
+        (GMON_HDRSIZE_BSD44_64): Ditto.
+        (GMON_HDRSIZE_OLDBSD_32): Ditto.
+        (GMON_HDRSIZE_OLDBSD_64): Ditto.
+        (struct raw_phdr): Wrap in #if 0, keeping it for
+        documentation purposes only.
+        (struct old_raw_phdr): Likewise.
+        (struct raw_arc): Likewise.  Change type/size of
+        "count" member to long match 4.4BSD.
+        * gmon_io: Update copyright years.
+        (gmon_io_read_64): New function.
+        (gmon_io_read_vma): Use bfd_arch_bits_per_address to
+        determine target pointer size.  Use gmon_io_read_32
+        and gmon_io_read_64.
+        (gmon_io_write_64): New function.
+        (gmon_io_write_vma): Use bfd_arch_bits_per_address to
+        determine target pointer size.  Use gmon_io_write_32
+        and gmon_io_write_64.
+        (get_vma): Remove.
+        (put_vma): Ditto.
+        (gmon_read_raw_arc): New function.
+        (gmon_write_raw_arc): New function.
+        (gmon_out_read): Do not use struct raw_phdr or
+        struct old_raw_phdr to read the gmon header.  Use
+        gmon_read_raw_arc to read call graph records.
+        (gmon_out_write): Do not use struct raw_phdr or
+        struct old_raw_phdr to write the gmon header.  Use
+        gmon_write_raw_arc to write call graph records.
+        * po/gprof.pot: Regenerate.
+        * Makefile.in: Regenerate.
+
+2002-01-31  Alan Modra  <amodra@bigpond.net.au>
+
+        * alpha.c (alpha_Instruction): Don't use.
+        (alpha_find_call): Avoid use of bitfields and casts between
+        pointers and integers of different sizes.  Avoid endian problems
+        when cross-compiling.
+        * vax.c (vax_find_call): Likewise.
+        (struct modebyte): Don't use.
+        (vax_operandmode): Pass in an unsigned char *.
+        (vax_operandlength): Likewise.
+        (vax_reladdr): Rename to vax_offset and return relative offset
+        rather than address.
+        * i386.c (i386_find_call): Avoid casts between pointers and
+        integers of different sizes.
+        * sparc.c (sparc_find_call): Likewise.  Avoid endian problems.
+        * tahoe.c (tahoe_find_call): Likewise.
+        (tahoe_reladdr): Rename to tahoe_offset and return relative offset
+        rather than address.
+
+        * basic_blocks.h: Don't include headers here.
+        * call_graph.h: Likewise.
+        * cg_arcs.h: Likewise.
+        * cg_print.h: Likewise.
+        * corefile.h: Likewise.
+        * gmon_io.h: Likewise.
+        * gmon_out.h: Likewise.
+        * hertz.h: Likewise.
+        * hist.h: Likewise.
+        * source.h: Likewise.
+        * sym_ids.h: Likewise.
+        * symtab.h: Likewise.
+        * gprof.h: Don't include ansidecl.h, do include bfd.h.
+        (bool): Don't typedef.
+        * alpha.c: Adjust #include's for above header changes.
+        * basic_blocks.c: Likewise.
+        * call_graph.c: Likewise.
+        * cg_arcs.c: Likewise.
+        * cg_dfn.c: Likewise.
+        * cg_print.c: Likewise.
+        * corefile.c: Likewise.
+        * gmon_io.c: Likewise.
+        * gprof.c: Likewise.
+        * hertz.c: Likewise.
+        * hist.c: Likewise.
+        * i386.c: Likewise.
+        * mips.c: Likewise.
+        * sparc.c: Likewise.
+        * sym_ids.c: Likewise.
+        * symtab.c: Likewise.
+        * tahoe.c: Likewise.
+        * utils.c: Likewise.
+        * vax.c: Likewise.
+
+        * po/POTFILES.in: Regenerate.
+
+2002-01-27  Daniel Jacobowitz  <drow@mvista.com>
+
+        * configure: Regenerated.
+
+2002-01-26  Richard Henderson  <rth@redhat.com>
+
+        * i386.c (i386_iscall): Static.
+        * tahoe.c (indirectchild, tahoe_operandmode): Static.
+        (tahoe_operandlength, tahoe_reladdr): Static.
+        * vax.c (indirectchild): Static.
+
+2002-01-26  Hans-Peter Nilsson  <hp@bitrange.com>
+
+        * Makefile.am (install): Depend on install-info.
+        * Makefile.in: Regenerate.
+
+2002-01-26  Jason Thorpe  <thorpej@wasabisystems.com>
+
+        * mips.c: New file.
+        * Makefile.am (sources): Add mips.c. 
+        (mips.o): New rule.
+        * Makefile.in: Regenerate. 
+        * corefile.c: Update copyright years.
+        (find_call): Call mips_find_call for bfd_arch_mips.
+
+2002-01-26  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * po/fr.po: Updated version.
+
+2002-01-25  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * po/es.po: Updated version.
+
+2002-01-17  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * po/gprof.pot: Regenerate.
+
+2002-01-07  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * po/es.po: New file: Spanish translation.
+        * configure.in (ALL_LINGUAS): Add es.
+        * configure: Regenerate.
+
+2002-01-03  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * gmon_io.c (gmon_out_read): Remove use of ngettext().  It is not
+        present under AIX.
+
+2002-01-02  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * cg_print.c (print_header): Fix spelling typo.
+
+        * gmon_io.c (gmon_out_read): Fix formatting of text messages to
+        allow easier translation into other languages.
+
+2001-12-21  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * configure.in (ALL_LINGUAS): Add sv.
+        * configure: Regenerate.
+        * po/sv.po: Import from translation project web site.
+
+2001-12-03  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * configure.in (LINGUAS): Add tr.
+        * configure: Regenerate.
+        * po/tr.po: Import from translation project's web site.
+
+2001-11-02  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * configure.in (ALL_LINGUAS): Add 'fr'.
+        * configure: Regernate.
+        * po/fr.po: New file.
+
+2001-10-03  Alan Modra  <amodra@bigpond.net.au>
+
+        * configure: Regenerate.
+
+2001-10-02  Alan Modra  <amodra@bigpond.net.au>
+
+        * Makefile.am (Makefile): Depend on bfd/configure.in.
+        Run "make dep-am".
+        * Makefile.in: Regenerate.
+
+2001-09-18  Bruno Haible  <haible@clisp.cons.org>
+
+        * gprof.c (main): For gettext, also set the LC_CTYPE locate facet.
+        * sym_ids.c: Include "safe-ctype.h" instead of <ctype.h>.
+        (parse_spec): Use ISDIGIT instead of isdigit.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+        * sparc.c (sparc_find_call): Warning fix.
+        * alpha.c (alpha_find_call): Likewise.
+
+2001-08-09  Alan Modra  <amodra@bigpond.net.au>
+
+        * alpha.c: Add missing prototypes.
+        * sparc.c: Likewise.
+        * tahoe.c: Likewise.
+        * vax.c: Likewise.
+        * i386.c: Likewise.
+        (i386_iscall): Don't use DEFUN.
+
+2001-07-19  Nick Clifton  <nickc@cambridge.redhat.com>
+
+        * NOTES: Rename to README for consistency with other binutils.
+
+2001-06-18  H.J. Lu <hjl@gnu.org>
+
+        * Makefile.am (diststuff): Add $(MANS).
+        (gprof.1): Remove the prefix `$(srcdir)/'.
+        * Makefile.in: Regenerated.
+
+        * gprof.1: Removed.
+
+2001-06-12  Ben Elliston  <bje@redhat.com>
+
+        * gprof.texi (File Format): Profile data files are stored in
+        target byte order, not host byte order.
+
+2001-05-16  Alexandre Oliva  <aoliva@redhat.com>
+
         * gmon_io.c (gmon_io_read, gmon_io_write_vma,
         gmon_io_write_32, gmon_io_write_8, gmon_io_write): Adjust
         argument list for K&R C.
 
-        2001-03-13  David Mosberger  <davidm@hpl.hp.com>
+2001-04-06  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
+        * gprof.texi: Put @c man begin and @c man end indications
+        to generate man page using texi2pod and pod2man.  Added SEEALSO,
+        SYNOPSIS, BUGS, FILES and DESCRIPTION from original gprof.1
+        enclosed in @ifset man condition.
+        * Makefile.am (MANCONF, TEXI2POD, POD2MAN): New variable.
+        Generate gprof.1 from gprof.texi.
+        * gprof.1: Generate from gprof.texi.
+        * Makefile.in: Regenerate.
+
+2001-03-13  David Mosberger  <davidm@hpl.hp.com>
+
         * hist.c (hist_dimension): Declare as an array of 16 characters.
         (hist_read_rec): If SAMPLEDEBUG, print each histogram bin count.
+
         * basic_blocks.c: Whitespace and formatting changes.
         * bb_exit_func.c: Ditto.
@@ -37 +452 @@
         * utils.c: Ditto.
         * vax.c: Ditto.
+
         * gmon_out.h (gmon_hist_hdr): Delete.
         (gmon_cg_arc_record): Delete.
+
         * gmon_io.c (put_vma): Declare "static".
         (get_vma): Ditto.
@@ -55 +472 @@
         * hist.c (hist_read_rec): Ditto.
         (hist_write_hist): Ditto.
+
         From Jes Sorensen  <jes@linuxcare.com>
         * gmon_out.h: Use GMON_PTR_SIZE instead of sizeof(char*).
@@ -65 +483 @@
         * Makefile.in: Regenerate.
 
-        2001-02-27  Alan Modra  <alan@linuxcare.com.au>
+2001-02-27  Alan Modra  <alan@linuxcare.com.au>
+
         * configure.in (BFD_VERSION): New.
         (AM_INIT_AUTOMAKE): Use $BFD_VERSION.
@@ -72 +491 @@
         * Makefile.am: Run "make dep-am"
         * Makefile.in: Regenerate.
-
-2001-06-10  Philip Blundell  <philb@gnu.org>
-
-        * configure.in: Set version to 2.11.1.
-        * configure: Regenerate.
-
-2001-06-07  Alan Modra  <amodra@bigpond.net.au>
-
-        * Many files: Update copyright notices.
-
-2001-03-16  Philip Blundell  <philb@gnu.org>
-
-        * configure: Regenerate.
-
-2001-03-11  Philip Blundell  <philb@gnu.org>
-
-        * configure.in: Set version to 2.11.
 
 2001-01-27  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
@@ -242 +644 @@
         HAVE_SYSCONF, try setitimer and fall back on sysconf.
 
-Fri Apr  7 15:56:57 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+2000-04-07  Andrew Cagney  <cagney@b1.cygnus.com>
  
         * configure.in (WARN_CFLAGS): Set to -W -Wall by default.  Add
@@ -331 +733 @@
         * Makefile.in: Rebuild.
 
-Mon Jun 14 10:35:28 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+1999-06-14  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
 
         * gprof.texi: Fix typo.
@@ -383 +785 @@
         * gconfig.in: Rebuild.
 
-Sun Dec  6 21:57:50 1998  Ian Lance Taylor  <ian@cygnus.com>
+1998-12-06  Ian Lance Taylor  <ian@cygnus.com>
 
         * gprof.texi (Symspecs): Mention that you have to add any
         underscore yourself when naming a symbol.
 
-Mon Nov  2 15:05:33 1998  Geoffrey Noer  <noer@cygnus.com>
+1998-11-02  Geoffrey Noer  <noer@cygnus.com>
 
         * configure.in: detect cygwin* instead of cygwin32*
@@ -1661 +2063 @@
         * gprof.c: symbol values are now real values, don't add the vma
         anymore. (done for solaris; should verify this on other platforms)
-        * ChangeLog: created.

branches/GNU/src/binutils/gprof/Makefile.am

@@ -24 +24 @@
         cg_print.c corefile.c gmon_io.c gprof.c hertz.c hist.c source.c \
         search_list.c symtab.c sym_ids.c utils.c \
-        i386.c alpha.c vax.c tahoe.c sparc.c
+        i386.c alpha.c vax.c tahoe.c sparc.c mips.c
 gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
 gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(INTLDEPS)
@@ -34 +34 @@
         search_list.h source.h sym_ids.h symtab.h utils.h
 
-EXTRA_DIST = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c bbconv.pl
-
 BUILT_SOURCES = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
-
-diststuff: $(BUILT_SOURCES) info
+EXTRA_DIST    = $(BUILT_SOURCES) bbconv.pl $(man_MANS)
+
+diststuff: $(BUILT_SOURCES) info $(man_MANS)
 
 .m.c:
@@ -50 +49 @@
           && mv tmp $(srcdir)/po/POTFILES.in
 
+MANCONF  = -Dman
+
+TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl
+
+POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
+
 info_TEXINFOS = gprof.texi
 man_MANS = gprof.1
+
+# Build the man page from the texinfo file
+# The sed command removes the no-adjust Nroff command so that
+# the man output looks standard.
+gprof.1: $(srcdir)/gprof.texi
+        touch $@
+        -$(TEXI2POD) $(MANCONF) -Dgprof < $(srcdir)/gprof.texi > gprof.pod
+        -($(POD2MAN) gprof.pod | \
+               sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || \
+               (rm -f $@.T$$$$ && exit 1)
+        rm -f gprof.pod
+
+Makefile: $(BFDDIR)/configure.in
+
+# We want install to imply install-info as per GNU standards, despite the
+# cygnus option.
+install: install-info
 
 # Targets to rebuild dependencies in this Makefile.
@@ -78 +101 @@
                 -e 's!@BFDDIR@!$(BFDDIR)!'      \
                 -e 's!@SRCDIR@!$(srcdir)!'      \
-                -e "s!@OBJDIR@!$${objdir}!"
+                -e "s!@OBJDIR@!$${objdir}!"     \
+                -e 's!@TOPDIR@!'`echo $(srcdir) | sed -e s,/gprof$$,,`'!'
 
 dep: DEP
@@ -101 +125 @@
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-basic_blocks.o: basic_blocks.c basic_blocks.h gprof.h \
-  $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h source.h search_list.h symtab.h \
-  ../bfd/bfd.h corefile.h gmon_io.h gmon.h gmon_out.h \
-  $(INCDIR)/libiberty.h sym_ids.h
-call_graph.o: call_graph.c cg_arcs.h gprof.h $(INCDIR)/ansidecl.h \
-  $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  symtab.h ../bfd/bfd.h source.h search_list.h call_graph.h \
-  corefile.h gmon_io.h gmon.h gmon_out.h sym_ids.h
+basic_blocks.o: basic_blocks.c $(INCDIR)/libiberty.h \
+  $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
+  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h basic_blocks.h \
+  corefile.h gmon_io.h gmon_out.h search_list.h source.h \
+  symtab.h sym_ids.h
+call_graph.o: call_graph.c gprof.h $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h ../bfd/config.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h cg_arcs.h call_graph.h corefile.h gmon_io.h \
+  gmon_out.h sym_ids.h
 cg_arcs.o: cg_arcs.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  call_graph.h symtab.h ../bfd/bfd.h source.h search_list.h \
-  cg_arcs.h cg_dfn.h cg_print.h utils.h sym_ids.h
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \
+  utils.h sym_ids.h
 cg_dfn.o: cg_dfn.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \
-  cg_dfn.h utils.h
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h cg_arcs.h cg_dfn.h utils.h
 cg_print.o: cg_print.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
-  cg_arcs.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h symtab.h ../bfd/bfd.h source.h \
-  search_list.h cg_print.h hist.h utils.h
+  gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h cg_arcs.h cg_print.h hist.h utils.h corefile.h
 corefile.o: corefile.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  corefile.h ../bfd/bfd.h symtab.h source.h search_list.h
-gmon_io.o: gmon_io.c cg_arcs.h gprof.h $(INCDIR)/ansidecl.h \
-  $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  symtab.h ../bfd/bfd.h source.h search_list.h basic_blocks.h \
-  corefile.h call_graph.h gmon_io.h gmon.h gmon_out.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h corefile.h
+gmon_io.o: gmon_io.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h basic_blocks.h \
+  corefile.h call_graph.h gmon_io.h gmon_out.h gmon.h \
   hertz.h hist.h $(INCDIR)/libiberty.h
-gprof.o: gprof.c $(INCDIR)/getopt.h $(INCDIR)/libiberty.h \
-  $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h basic_blocks.h source.h search_list.h \
-  symtab.h ../bfd/bfd.h call_graph.h cg_arcs.h cg_print.h \
-  corefile.h gmon_io.h gmon.h hertz.h hist.h sym_ids.h \
-  $(INCDIR)/demangle.h
-hertz.o: hertz.c hertz.h gprof.h $(INCDIR)/ansidecl.h \
-  $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h
+gprof.o: gprof.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
+  gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h basic_blocks.h call_graph.h cg_arcs.h cg_print.h \
+  corefile.h gmon_io.h hertz.h hist.h sym_ids.h $(INCDIR)/demangle.h
+hertz.o: hertz.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  hertz.h
 hist.o: hist.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  corefile.h ../bfd/bfd.h gmon_io.h gmon.h gmon_out.h \
-  hist.h symtab.h source.h search_list.h sym_ids.h utils.h
-source.o: source.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h $(INCDIR)/libiberty.h \
-  search_list.h source.h
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h corefile.h gmon_io.h gmon_out.h hist.h sym_ids.h \
+  utils.h
+source.o: source.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/libiberty.h search_list.h source.h
 search_list.o: search_list.c $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h search_list.h
-symtab.o: symtab.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h
+  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
+  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h search_list.h
+symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h
 sym_ids.o: sym_ids.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
-  cg_arcs.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h symtab.h ../bfd/bfd.h source.h \
-  search_list.h sym_ids.h
-utils.o: utils.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h
-i386.o: i386.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h hist.h
-alpha.o: alpha.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h hist.h
-vax.o: vax.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h hist.h
-tahoe.o: tahoe.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h hist.h
-sparc.o: sparc.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h hist.h
-flat_bl.o: flat_bl.c
-bsd_callg_bl.o: bsd_callg_bl.c
-fsf_callg_bl.o: fsf_callg_bl.c
+  $(INCDIR)/safe-ctype.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
+  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h search_list.h \
+  source.h symtab.h cg_arcs.h sym_ids.h
+utils.o: utils.c $(INCDIR)/demangle.h $(INCDIR)/ansidecl.h \
+  gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h cg_arcs.h utils.h
+i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+mips.o: mips.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
+bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h
+fsf_callg_bl.o: fsf_callg_bl.c $(INCDIR)/ansidecl.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

branches/GNU/src/binutils/gprof/Makefile.in

@@ -1 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -124 +124 @@
         cg_print.c corefile.c gmon_io.c gprof.c hertz.c hist.c source.c \
         search_list.c symtab.c sym_ids.c utils.c \
-        i386.c alpha.c vax.c tahoe.c sparc.c
+        i386.c alpha.c vax.c tahoe.c sparc.c mips.c
 
 gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
@@ -136 +136 @@
 
 
-EXTRA_DIST = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c bbconv.pl
-
 BUILT_SOURCES = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
+EXTRA_DIST = $(BUILT_SOURCES) bbconv.pl $(man_MANS)
 
 POTFILES = $(sources) $(noinst_HEADERS)
+
+MANCONF = -Dman
+
+TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl
+
+POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
 
 info_TEXINFOS = gprof.texi
@@ -163 +168 @@
 hist.$(OBJEXT) source.$(OBJEXT) search_list.$(OBJEXT) symtab.$(OBJEXT) \
 sym_ids.$(OBJEXT) utils.$(OBJEXT) i386.$(OBJEXT) alpha.$(OBJEXT) \
-vax.$(OBJEXT) tahoe.$(OBJEXT) sparc.$(OBJEXT) flat_bl.$(OBJEXT) \
-bsd_callg_bl.$(OBJEXT) fsf_callg_bl.$(OBJEXT)
+vax.$(OBJEXT) tahoe.$(OBJEXT) sparc.$(OBJEXT) mips.$(OBJEXT) \
+flat_bl.$(OBJEXT) bsd_callg_bl.$(OBJEXT) fsf_callg_bl.$(OBJEXT)
 gprof_LDFLAGS = 
 CFLAGS = @CFLAGS@
@@ -182 +187 @@
 HEADERS =  $(noinst_HEADERS)
 
-DIST_COMMON =  ./stamp-h.in ChangeLog Makefile.am Makefile.in TODO \
-acconfig.h acinclude.m4 aclocal.m4 configure configure.in gconfig.in
+DIST_COMMON =  README ./stamp-h.in ChangeLog Makefile.am Makefile.in \
+TODO acinclude.m4 aclocal.m4 configure configure.in gconfig.in
 
 
@@ -226 +231 @@
                 $(MAKE) $(srcdir)/stamp-h.in; \
         else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
         cd $(top_srcdir) && $(AUTOHEADER)
         @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
@@ -385 +390 @@
         list='$(INFO_DEPS)'; \
         for file in $$list; do \
-          test -z "$ii" \
+          test -z "$$ii" \
             || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
         done
@@ -499 +504 @@
         rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
           rev="$$subdir $$rev"; \
-          test "$$subdir" = "." && dot_seen=yes; \
+          test "$$subdir" != "." || dot_seen=yes; \
         done; \
         test "$$dot_seen" = "no" && rev=". $$rev"; \
@@ -707 +712 @@
 
 
-diststuff: $(BUILT_SOURCES) info
+diststuff: $(BUILT_SOURCES) info $(man_MANS)
 
 .m.c:
@@ -716 +721 @@
         for file in $(POTFILES); do echo $$file; done | sort > tmp \
           && mv tmp $(srcdir)/po/POTFILES.in
+
+# Build the man page from the texinfo file
+# The sed command removes the no-adjust Nroff command so that
+# the man output looks standard.
+gprof.1: $(srcdir)/gprof.texi
+        touch $@
+        -$(TEXI2POD) $(MANCONF) -Dgprof < $(srcdir)/gprof.texi > gprof.pod
+        -($(POD2MAN) gprof.pod | \
+               sed -e '/^.if n .na/d' > $@.T$$$$ && \
+               mv -f $@.T$$$$ $@) || \
+               (rm -f $@.T$$$$ && exit 1)
+        rm -f gprof.pod
+
+Makefile: $(BFDDIR)/configure.in
+
+# We want install to imply install-info as per GNU standards, despite the
+# cygnus option.
+install: install-info
 
 # Targets to rebuild dependencies in this Makefile.
@@ -742 +765 @@
                 -e 's!@BFDDIR@!$(BFDDIR)!'      \
                 -e 's!@SRCDIR@!$(srcdir)!'      \
-                -e "s!@OBJDIR@!$${objdir}!"
+                -e "s!@OBJDIR@!$${objdir}!"     \
+                -e 's!@TOPDIR@!'`echo $(srcdir) | sed -e s,/gprof$$,,`'!'
 
 dep: DEP
@@ -763 +787 @@
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-basic_blocks.o: basic_blocks.c basic_blocks.h gprof.h \
-  $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h source.h search_list.h symtab.h \
-  ../bfd/bfd.h corefile.h gmon_io.h gmon.h gmon_out.h \
-  $(INCDIR)/libiberty.h sym_ids.h
-call_graph.o: call_graph.c cg_arcs.h gprof.h $(INCDIR)/ansidecl.h \
-  $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  symtab.h ../bfd/bfd.h source.h search_list.h call_graph.h \
-  corefile.h gmon_io.h gmon.h gmon_out.h sym_ids.h
+basic_blocks.o: basic_blocks.c $(INCDIR)/libiberty.h \
+  $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
+  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h basic_blocks.h \
+  corefile.h gmon_io.h gmon_out.h search_list.h source.h \
+  symtab.h sym_ids.h
+call_graph.o: call_graph.c gprof.h $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h ../bfd/config.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h cg_arcs.h call_graph.h corefile.h gmon_io.h \
+  gmon_out.h sym_ids.h
 cg_arcs.o: cg_arcs.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  call_graph.h symtab.h ../bfd/bfd.h source.h search_list.h \
-  cg_arcs.h cg_dfn.h cg_print.h utils.h sym_ids.h
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \
+  utils.h sym_ids.h
 cg_dfn.o: cg_dfn.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  cg_arcs.h symtab.h ../bfd/bfd.h source.h search_list.h \
-  cg_dfn.h utils.h
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h cg_arcs.h cg_dfn.h utils.h
 cg_print.o: cg_print.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
-  cg_arcs.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h symtab.h ../bfd/bfd.h source.h \
-  search_list.h cg_print.h hist.h utils.h
+  gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h cg_arcs.h cg_print.h hist.h utils.h corefile.h
 corefile.o: corefile.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  corefile.h ../bfd/bfd.h symtab.h source.h search_list.h
-gmon_io.o: gmon_io.c cg_arcs.h gprof.h $(INCDIR)/ansidecl.h \
-  $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  symtab.h ../bfd/bfd.h source.h search_list.h basic_blocks.h \
-  corefile.h call_graph.h gmon_io.h gmon.h gmon_out.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h corefile.h
+gmon_io.o: gmon_io.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h basic_blocks.h \
+  corefile.h call_graph.h gmon_io.h gmon_out.h gmon.h \
   hertz.h hist.h $(INCDIR)/libiberty.h
-gprof.o: gprof.c $(INCDIR)/getopt.h $(INCDIR)/libiberty.h \
-  $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h basic_blocks.h source.h search_list.h \
-  symtab.h ../bfd/bfd.h call_graph.h cg_arcs.h cg_print.h \
-  corefile.h gmon_io.h gmon.h hertz.h hist.h sym_ids.h \
-  $(INCDIR)/demangle.h
-hertz.o: hertz.c hertz.h gprof.h $(INCDIR)/ansidecl.h \
-  $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h
+gprof.o: gprof.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
+  gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h basic_blocks.h call_graph.h cg_arcs.h cg_print.h \
+  corefile.h gmon_io.h hertz.h hist.h sym_ids.h $(INCDIR)/demangle.h
+hertz.o: hertz.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  hertz.h
 hist.o: hist.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h gconfig.h $(INCDIR)/bin-bugs.h \
-  corefile.h ../bfd/bfd.h gmon_io.h gmon.h gmon_out.h \
-  hist.h symtab.h source.h search_list.h sym_ids.h utils.h
-source.o: source.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h corefile.h gmon_io.h gmon_out.h hist.h sym_ids.h \
+  utils.h
+source.o: source.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
   ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h $(INCDIR)/libiberty.h \
-  search_list.h source.h
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/libiberty.h search_list.h source.h
 search_list.o: search_list.c $(INCDIR)/libiberty.h \
   $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h search_list.h
-symtab.o: symtab.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
+  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h search_list.h
+symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
   ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h
 sym_ids.o: sym_ids.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
-  cg_arcs.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h symtab.h ../bfd/bfd.h source.h \
-  search_list.h sym_ids.h
-utils.o: utils.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h gconfig.h \
-  $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h
-i386.o: i386.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
+  $(INCDIR)/safe-ctype.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
+  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h search_list.h \
+  source.h symtab.h cg_arcs.h sym_ids.h
+utils.o: utils.c $(INCDIR)/demangle.h $(INCDIR)/ansidecl.h \
+  gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  symtab.h cg_arcs.h utils.h
+i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
   ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h hist.h
-alpha.o: alpha.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
   ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h hist.h
-vax.o: vax.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
   ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h hist.h
-tahoe.o: tahoe.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
   ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h hist.h
-sparc.o: sparc.c gprof.h $(INCDIR)/ansidecl.h $(BFDDIR)/sysdep.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
   ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  gconfig.h $(INCDIR)/bin-bugs.h cg_arcs.h symtab.h ../bfd/bfd.h \
-  source.h search_list.h corefile.h hist.h
-flat_bl.o: flat_bl.c
-bsd_callg_bl.o: bsd_callg_bl.c
-fsf_callg_bl.o: fsf_callg_bl.c
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+mips.o: mips.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
+  ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
+bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h
+fsf_callg_bl.o: fsf_callg_bl.c $(INCDIR)/ansidecl.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 

branches/GNU/src/binutils/gprof/TODO

@@ -1 +1 @@
 
-- gmon_io.c cannot deal with target architecture that have a pointer size
-  that is different from the host architectures pointer size---fix this
-  (gmon_out.h, and gmon_io.c)
 - add support for prof file format so that prof files can be displayed
   at the line-level (this is useful for the uprofile tool under DEC's

branches/GNU/src/binutils/gprof/aclocal.m4

@@ -1 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
 
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -35 +35 @@
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN(AM_INIT_AUTOMAKE,
+AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
@@ -63 +63 @@
 #
 
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
@@ -104 +104 @@
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
+AC_DEFUN([AM_MISSING_PROG],
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
@@ -120 +120 @@
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
-AC_DEFUN(AM_CONFIG_HEADER,
+AC_DEFUN([AM_CONFIG_HEADER],
 [AC_PREREQ([2.12])
 AC_CONFIG_HEADER([$1])
@@ -146 +146 @@
 # serial 1
 
-AC_DEFUN(AM_MAINTAINER_MODE,
+AC_DEFUN([AM_MAINTAINER_MODE],
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
@@ -163 +163 @@
 # Define a conditional.
 
-AC_DEFUN(AM_CONDITIONAL,
+AC_DEFUN([AM_CONDITIONAL],
 [AC_SUBST($1_TRUE)
 AC_SUBST($1_FALSE)

branches/GNU/src/binutils/gprof/alpha.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1983, 1998 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993, 1998
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
 #include "corefile.h"
 #include "hist.h"
-#include "symtab.h"
 
 /*
@@ -34 +46 @@
 #define Jxx_FUNC_JSR_COROUTINE  3
 
+#if 0
+/* Here to document only.  We can't use this when cross compiling as
+   the bitfield layout might not be the same as native.  */
 typedef union
   {
@@ -60 +75 @@
   }
 alpha_Instruction;
+#endif
 
 static Sym indirect_child;
 
+void alpha_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
 
 /*
@@ -77 +94 @@
      bfd_vma p_highpc;
 {
-  static bfd_vma delta = 0;
-  bfd_vma dest_pc;
-  alpha_Instruction *pc;
+  bfd_vma pc, dest_pc;
+  unsigned int insn;
   Sym *child;
 
-  if (!delta)
+  if (indirect_child.name == NULL)
     {
-      delta = (bfd_vma) core_text_space - core_text_sect->vma;
-
       sym_init (&indirect_child);
       indirect_child.name = _("<indirect child>");
@@ -107 +121 @@
                           parent->name, (unsigned long) p_lowpc,
                           (unsigned long) p_highpc));
-  for (pc = (alpha_Instruction *) (p_lowpc + delta);
-       pc < (alpha_Instruction *) (p_highpc + delta);
-       ++pc)
+  for (pc = (p_lowpc + 3) & ~(bfd_vma) 3; pc < p_highpc; pc += 4)
     {
-      switch (pc->a.op_code)
+      insn = bfd_get_32 (core_bfd, ((unsigned char *) core_text_space
+                                    + pc - core_text_sect->vma));
+      switch (insn & (0x3f << 26))
         {
-        case OP_Jxx:
+        case OP_Jxx << 26:
           /*
            * There is no simple and reliable way to determine the
@@ -122 +136 @@
            * to see that there are other calls as well.
            */
-          if (pc->j.func == Jxx_FUNC_JSR
-              || pc->j.func == Jxx_FUNC_JSR_COROUTINE)
+          if ((insn & (3 << 14)) == Jxx_FUNC_JSR << 14
+              || (insn & (3 << 14)) == Jxx_FUNC_JSR_COROUTINE << 14)
             {
               DBG (CALLDEBUG,
                    printf (_("[find_call] 0x%lx: jsr%s <indirect_child>\n"),
-                           (unsigned long) pc - delta,
-                           pc->j.func == Jxx_FUNC_JSR ? "" : "_coroutine"));
+                           (unsigned long) pc,
+                           ((insn & (3 << 14)) == Jxx_FUNC_JSR << 14
+                            ? "" : "_coroutine")));
               arc_add (parent, &indirect_child, (unsigned long) 0);
             }
           break;
 
-        case OP_BSR:
+        case OP_BSR << 26:
           DBG (CALLDEBUG,
-               printf (_("[find_call] 0x%lx: bsr"),
-                       (unsigned long) pc - delta));
+               printf (_("[find_call] 0x%lx: bsr"), (unsigned long) pc));
           /*
            * Regular PC relative addressing.  Check that this is the
            * address of a function.  The linker sometimes redirects
            * the entry point by 8 bytes to skip loading the global
-           * pointer, so we all for either address:
+           * pointer, so we allow for either address:
            */
-          dest_pc = ((bfd_vma) (pc + 1 + pc->b.disp)) - delta;
+          dest_pc = pc + 4 + (((bfd_signed_vma) (insn & 0x1fffff)
+                               ^ 0x100000) - 0x100000);
           if (dest_pc >= s_lowpc && dest_pc <= s_highpc)
             {

branches/GNU/src/binutils/gprof/basic_blocks.c

@@ -3 +3 @@
    basic-block related statistics.
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -23 +23 @@
 
 
-#include <stdio.h>
+#include "libiberty.h"
+#include "gprof.h"
 #include "basic_blocks.h"
 #include "corefile.h"
 #include "gmon_io.h"
 #include "gmon_out.h"
-#include "gprof.h"
-#include "libiberty.h"
+#include "search_list.h"
 #include "source.h"
+#include "symtab.h"
 #include "sym_ids.h"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+
+static int cmp_bb PARAMS ((const PTR, const PTR));
+static int cmp_ncalls PARAMS ((const PTR, const PTR));
+static void fskip_string PARAMS ((FILE *));
+static void annotate_with_count PARAMS ((char *, unsigned int, int, PTR));
 
 /* Default option values:  */
-bool bb_annotate_all_lines = FALSE;
+bfd_boolean bb_annotate_all_lines = FALSE;
 unsigned long bb_min_calls = 1;
 int bb_table_length = 10;
@@ -51 +54 @@
 
 static int
-DEFUN (cmp_bb, (lp, rp), const void *lp AND const void *rp)
+cmp_bb (lp, rp)
+     const PTR lp;
+     const PTR rp;
 {
   int r;
@@ -80 +85 @@
    calls, ties are broken in increasing order of line numbers.  */
 static int
-DEFUN (cmp_ncalls, (lp, rp), const void *lp AND const void *rp)
+cmp_ncalls (lp, rp)
+     const PTR lp;
+     const PTR rp;
 {
   const Sym *left = *(const Sym **) lp;
@@ -100 +107 @@
 /* Skip over variable length string.  */
 static void
-DEFUN (fskip_string, (fp), FILE * fp)
+fskip_string (fp)
+     FILE *fp;
 {
   int ch;
@@ -115 +123 @@
 
 void
-DEFUN (bb_read_rec, (ifp, filename), FILE * ifp AND const char *filename)
+bb_read_rec (ifp, filename)
+     FILE *ifp;
+     const char *filename;
 {
   int nblocks, b;
@@ -185 +195 @@
       else
         {
-          static bool user_warned = FALSE;
+          static bfd_boolean user_warned = FALSE;
 
           if (!user_warned)
@@ -203 +213 @@
    only.  */
 void
-DEFUN (bb_write_blocks, (ofp, filename), FILE * ofp AND const char *filename)
-{
-  int nblocks = 0;
+bb_write_blocks (ofp, filename)
+     FILE *ofp;
+     const char *filename;
+{
+  unsigned int nblocks = 0;
   Sym *sym;
   int i;
@@ -231 +243 @@
         {
           if (gmon_io_write_vma (ofp, sym->bb_addr[i])
-              || gmon_io_write_vma (ofp, sym->bb_calls[i]))
+              || gmon_io_write_vma (ofp, (bfd_vma) sym->bb_calls[i]))
             {
               perror (filename);
@@ -246 +258 @@
 
 void
-DEFUN_VOID (print_exec_counts)
+print_exec_counts ()
 {
   Sym **sorted_bbs, *sym;
-  int i, j, len;
+  unsigned int i, j, len;
 
   if (first_output)
@@ -313 +325 @@
 
 static void
-DEFUN (annotate_with_count, (buf, width, line_num, arg),
-       char *buf AND int width AND int line_num AND void *arg)
+annotate_with_count (buf, width, line_num, arg)
+     char *buf;
+     unsigned int width;
+     int line_num;
+     PTR arg;
 {
   Source_File *sf = arg;
   Sym *b;
-  int i;
+  unsigned int i;
   static unsigned long last_count;
   unsigned long last_print = (unsigned long) -1;
@@ -339 +354 @@
       unsigned long ncalls;
       int ncalls_set;
-      int len;
+      unsigned int len;
 
       ++num_executable_lines;
@@ -415 +430 @@
       if (! ncalls_set)
         {
-          int c;
+          unsigned int c;
 
           for (c = 0; c < width; c++)
@@ -442 +457 @@
       else
         {
-          int c;
+          unsigned int c;
 
           strcpy (buf + width - len, tmpbuf);
@@ -456 +471 @@
 
 void
-DEFUN_VOID (print_annotated_source)
+print_annotated_source ()
 {
   Sym *sym, *line_stats, *new_line;

branches/GNU/src/binutils/gprof/basic_blocks.h

@@ -1 +1 @@
 /* basic_blocks.h
-   Copyright 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Binutils.
@@ -22 +22 @@
 #define basic_blocks_h
 
-#include <stdio.h>
-#include "gprof.h"
-#include "source.h"
-#include "symtab.h"
-
 /* Options:  */
-extern bool bb_annotate_all_lines;      /* Force annotation of all lines?  */
+extern bfd_boolean bb_annotate_all_lines; /* Force annotation of all lines?  */
 extern int bb_table_length;             /* Length of most-used bb table.  */
 extern unsigned long bb_min_calls;      /* Minimum execution count.  */

branches/GNU/src/binutils/gprof/bsd_callg_bl.c

@@ -3 +3 @@
 
 #include <stdio.h>
+#include "ansidecl.h"
 
+void  bsd_callg_blurb PARAMS ((FILE *));
 void
 bsd_callg_blurb (file)

branches/GNU/src/binutils/gprof/call_graph.c

@@ -1 +1 @@
 /* call_graph.c  -  Create call graphs.
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -21 +21 @@
 
 
+#include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
 #include "call_graph.h"
@@ -26 +30 @@
 #include "gmon_io.h"
 #include "gmon_out.h"
-#include "symtab.h"
 #include "sym_ids.h"
 
-extern void
-DEFUN (cg_tally, (from_pc, self_pc, count),
-       bfd_vma from_pc AND bfd_vma self_pc AND unsigned long count)
+void
+cg_tally (from_pc, self_pc, count)
+     bfd_vma from_pc;
+     bfd_vma self_pc;
+     unsigned long count;
 {
   Sym *parent;
@@ -77 +82 @@
 
 void
-DEFUN (cg_read_rec, (ifp, filename), FILE * ifp AND CONST char *filename)
+cg_read_rec (ifp, filename)
+     FILE *ifp;
+     const char *filename;
 {
   bfd_vma from_pc, self_pc;
@@ -104 +111 @@
 
 void
-DEFUN (cg_write_arcs, (ofp, filename), FILE * ofp AND const char *filename)
+cg_write_arcs (ofp, filename)
+     FILE *ofp;
+     const char *filename;
 {
   Arc *arc;

branches/GNU/src/binutils/gprof/call_graph.h

@@ -23 +23 @@
 #define call_graph_h
 
-#include <stdio.h>
-#include "gprof.h"
-#include "symtab.h"
-
 extern void cg_tally      PARAMS ((bfd_vma, bfd_vma, unsigned long));
 extern void cg_read_rec   PARAMS ((FILE *, const char *));

branches/GNU/src/binutils/gprof/cg_arcs.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1983, 2001 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993, 2001
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 #include "libiberty.h"
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "call_graph.h"
 #include "cg_arcs.h"
@@ -26 +39 @@
 #include "sym_ids.h"
 
+static int cmp_topo PARAMS ((const PTR, const PTR));
+static void propagate_time PARAMS ((Sym *));
+static void cycle_time PARAMS ((void));
+static void cycle_link PARAMS ((void));
+static void inherit_flags PARAMS ((Sym *));
+static void propagate_flags PARAMS ((Sym **));
+static int cmp_total PARAMS ((const PTR, const PTR));
+
 Sym *cycle_header;
 unsigned int num_cycles;
@@ -36 +57 @@
  */
 Arc *
-DEFUN (arc_lookup, (parent, child), Sym * parent AND Sym * child)
+arc_lookup (parent, child)
+     Sym *parent;
+     Sym *child;
 {
   Arc *arc;
@@ -65 +88 @@
  */
 void
-DEFUN (arc_add, (parent, child, count),
-       Sym * parent AND Sym * child AND unsigned long count)
+arc_add (parent, child, count)
+     Sym *parent;
+     Sym *child;
+     unsigned long count;
 {
   static unsigned int maxarcs = 0;
@@ -132 +157 @@
 
 static int
-DEFUN (cmp_topo, (lp, rp), const PTR lp AND const PTR rp)
+cmp_topo (lp, rp)
+     const PTR lp;
+     const PTR rp;
 {
   const Sym *left = *(const Sym **) lp;
@@ -142 +169 @@
 
 static void
-DEFUN (propagate_time, (parent), Sym * parent)
+propagate_time (parent)
+     Sym *parent;
 {
   Arc *arc;
@@ -226 +254 @@
  */
 static void
-DEFUN_VOID (cycle_time)
+cycle_time ()
 {
   Sym *member, *cyc;
@@ -250 +278 @@
 
 static void
-DEFUN_VOID (cycle_link)
+cycle_link ()
 {
   Sym *sym, *cyc, *member;
@@ -338 +366 @@
  */
 static void
-DEFUN (inherit_flags, (child), Sym * child)
+inherit_flags (child)
+     Sym *child;
 {
   Sym *head, *parent, *member;
@@ -416 +445 @@
  */
 static void
-DEFUN (propagate_flags, (symbols), Sym ** symbols)
+propagate_flags (symbols)
+     Sym **symbols;
 {
   int index;
@@ -516 +546 @@
  */
 static int
-DEFUN (cmp_total, (lp, rp), const PTR lp AND const PTR rp)
+cmp_total (lp, rp)
+     const PTR lp;
+     const PTR rp;
 {
   const Sym *left = *(const Sym **) lp;
@@ -573 +605 @@
  */
 Sym **
-DEFUN_VOID (cg_assemble)
+cg_assemble ()
 {
   Sym *parent, **time_sorted_syms, **top_sorted_syms;

branches/GNU/src/binutils/gprof/cg_arcs.h

@@ -1 +1 @@
 #ifndef cg_arcs_h
 #define cg_arcs_h
-
-#include "gprof.h"
-#include "symtab.h"
 
 /*

branches/GNU/src/binutils/gprof/cg_dfn.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-#include <stdio.h>
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
 #include "libiberty.h"
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
 #include "cg_dfn.h"
-#include "symtab.h"
 #include "utils.h"
 
@@ -34 +45 @@
 DFN_Stack;
 
+static bfd_boolean is_numbered PARAMS ((Sym *));
+static bfd_boolean is_busy PARAMS ((Sym *));
+static void find_cycle PARAMS ((Sym *));
+static void pre_visit PARAMS ((Sym *));
+static void post_visit PARAMS ((Sym *));
+
 DFN_Stack *dfn_stack = NULL;
 int dfn_maxdepth = 0;
@@ -43 +60 @@
  * Is CHILD already numbered?
  */
-static bool
-DEFUN (is_numbered, (child), Sym * child)
+static bfd_boolean
+is_numbered (child)
+     Sym *child;
 {
   return child->cg.top_order != DFN_NAN && child->cg.top_order != DFN_BUSY;
@@ -53 +71 @@
  * Is CHILD already busy?
  */
-static bool
-DEFUN (is_busy, (child), Sym * child)
+static bfd_boolean
+is_busy (child)
+     Sym *child;
 {
   if (child->cg.top_order == DFN_NAN)
@@ -71 +90 @@
  */
 static void
-DEFUN (find_cycle, (child), Sym * child)
+find_cycle (child)
+     Sym *child;
 {
   Sym *head = 0;
@@ -194 +214 @@
  */
 static void
-DEFUN (pre_visit, (parent), Sym * parent)
+pre_visit (parent)
+     Sym *parent;
 {
   ++dfn_depth;
@@ -218 +239 @@
  */
 static void
-DEFUN (post_visit, (parent), Sym * parent)
+post_visit (parent)
+     Sym *parent;
 {
   Sym *member;
@@ -252 +274 @@
  */
 void
-DEFUN (cg_dfn, (parent), Sym * parent)
+cg_dfn (parent)
+     Sym *parent;
 {
   Arc *arc;

branches/GNU/src/binutils/gprof/cg_print.c

@@ -1 +1 @@
 /* cg_print.c -  Print routines for displaying call graphs.
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -22 +22 @@
 
 #include "libiberty.h"
+#include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
 #include "cg_print.h"
 #include "hist.h"
 #include "utils.h"
+#include "corefile.h"
 
 /* Return value of comparison functions used to sort tables.  */
@@ -32 +37 @@
 #define GREATERTHAN     1
 
-static void order_and_dump_functions_by_arcs PARAMS ((Arc **, unsigned long,
-                                                      int, Arc **,
-                                                      unsigned long *));
+static void print_header PARAMS ((void));
+static void print_cycle PARAMS ((Sym *));
+static int cmp_member PARAMS ((Sym *, Sym *));
+static void sort_members PARAMS ((Sym *));
+static void print_members PARAMS ((Sym *));
+static int cmp_arc PARAMS ((Arc *, Arc *));
+static void sort_parents PARAMS ((Sym *));
+static void print_parents PARAMS ((Sym *));
+static void sort_children PARAMS ((Sym *));
+static void print_children PARAMS ((Sym *));
+static void print_line PARAMS ((Sym *));
+static int cmp_name PARAMS ((const PTR, const PTR));
+static int cmp_arc_count PARAMS ((const PTR, const PTR));
+static int cmp_fun_nuses PARAMS ((const PTR, const PTR));
+static void order_and_dump_functions_by_arcs
+  PARAMS ((Arc **, unsigned long, int, Arc **, unsigned long *));
+
 /* Declarations of automatically generated functions to output blurbs.  */
 extern void bsd_callg_blurb PARAMS ((FILE * fp));
@@ -43 +62 @@
 
 static void
-DEFUN_VOID (print_header)
+print_header ()
 {
   if (first_output)
@@ -77 +96 @@
               "", "", "", "", _("called"), _("total"), _("parents"));
       printf ("%-6.6s %5.5s %7.7s %11.11s %7.7s+%-7.7s %-8.8s\t%5.5s\n",
-              _("index"), _("%time"), _("self"), _("descendents"),
+              _("index"), _("%time"), _("self"), _("descendants"),
               _("called"), _("self"), _("name"), _("index"));
       printf ("%6.6s %5.5s %7.7s %11.11s %7.7s/%-7.7s     %-8.8s\n",
@@ -92 +111 @@
 
 static void
-DEFUN (print_cycle, (cyc), Sym * cyc)
+print_cycle (cyc)
+     Sym *cyc;
 {
   char buf[BUFSIZ];
@@ -115 +135 @@
 
 static int
-DEFUN (cmp_member, (left, right), Sym * left AND Sym * right)
+cmp_member (left, right)
+     Sym *left;
+     Sym *right;
 {
   double left_time = left->cg.prop.self + left->cg.prop.child;
@@ -140 +162 @@
 
 static void
-DEFUN (sort_members, (cyc), Sym * cyc)
+sort_members (cyc)
+     Sym *cyc;
 {
   Sym *todo, *doing, *prev;
@@ -167 +190 @@
 
 static void
-DEFUN (print_members, (cyc), Sym * cyc)
+print_members (cyc)
+     Sym *cyc;
 {
   Sym *member;
@@ -201 +225 @@
 
 static int
-DEFUN (cmp_arc, (left, right), Arc * left AND Arc * right)
+cmp_arc (left, right)
+     Arc *left;
+     Arc *right;
 {
   Sym *left_parent = left->parent;
@@ -287 +313 @@
 
 static void
-DEFUN (sort_parents, (child), Sym * child)
+sort_parents (child)
+     Sym * child;
 {
   Arc *arc, *detached, sorted, *prev;
@@ -320 +347 @@
 
 static void
-DEFUN (print_parents, (child), Sym * child)
+print_parents (child)
+     Sym *child;
 {
   Sym *parent;
@@ -374 +402 @@
 
 static void
-DEFUN (sort_children, (parent), Sym * parent)
+sort_children (parent)
+     Sym *parent;
 {
   Arc *arc, *detached, sorted, *prev;
@@ -407 +436 @@
 
 static void
-DEFUN (print_children, (parent), Sym * parent)
+print_children (parent)
+     Sym *parent;
 {
   Sym *child;
@@ -446 +476 @@
 
 static void
-DEFUN (print_line, (np), Sym * np)
+print_line (np)
+     Sym *np;
 {
   char buf[BUFSIZ];
@@ -479 +510 @@
 
 void
-DEFUN (cg_print, (timesortsym), Sym ** timesortsym)
+cg_print (timesortsym)
+     Sym ** timesortsym;
 {
   unsigned int index;
@@ -530 +562 @@
 
 static int
-DEFUN (cmp_name, (left, right), const PTR left AND const PTR right)
+cmp_name (left, right)
+     const PTR left;
+     const PTR right;
 {
   const Sym **npp1 = (const Sym **) left;
@@ -540 +574 @@
 
 void
-DEFUN_VOID (cg_print_index)
+cg_print_index ()
 {
   unsigned int index;
@@ -654 +688 @@
 
 static int
-DEFUN (cmp_arc_count, (left, right), const PTR left AND const PTR right)
+cmp_arc_count (left, right)
+     const PTR left;
+     const PTR right;
 {
   const Arc **npp1 = (const Arc **) left;
@@ -671 +707 @@
 
 static int
-DEFUN (cmp_fun_nuses, (left, right), const PTR left AND const PTR right)
+cmp_fun_nuses (left, right)
+     const PTR left;
+     const PTR right;
 {
   const Sym **npp1 = (const Sym **) left;
@@ -753 +791 @@
 
 void
-DEFUN_VOID (cg_print_function_ordering)
+cg_print_function_ordering ()
 {
   unsigned long index, used, unused, scratch_index;
@@ -958 +996 @@
 }
 
-/* Place functions based on the arcs in ARCS with NUMARCS entries;
+/* Place functions based on the arcs in THE_ARCS with ARC_COUNT entries;
    place unused arcs into UNPLACED_ARCS/UNPLACED_ARC_COUNT.
 
-   If ALL is nonzero, then place all functions referenced by ARCS,
-   else only place those referenced in the top 99% of the arcs in ARCS.  */
+   If ALL is nonzero, then place all functions referenced by THE_ARCS,
+   else only place those referenced in the top 99% of the arcs in THE_ARCS.  */
 
 #define MOST 0.99
 static void
-order_and_dump_functions_by_arcs (arcs, numarcs, all,
+order_and_dump_functions_by_arcs (the_arcs, arc_count, all,
                                   unplaced_arcs, unplaced_arc_count)
-     Arc **arcs;
-     unsigned long numarcs;
+     Arc **the_arcs;
+     unsigned long arc_count;
      int all;
      Arc **unplaced_arcs;
@@ -987 +1025 @@
     {
       total_arcs = 0;
-      for (index = 0; index < numarcs; index++)
-        total_arcs += arcs[index]->count;
+      for (index = 0; index < arc_count; index++)
+        total_arcs += the_arcs[index]->count;
     }
   else
@@ -995 +1033 @@
   tmp_arcs = 0;
 
-  for (index = 0; index < numarcs; index++)
+  for (index = 0; index < arc_count; index++)
     {
       Sym *sym1, *sym2;
       Sym *child, *parent;
 
-      tmp_arcs += arcs[index]->count;
+      tmp_arcs += the_arcs[index]->count;
 
       /* Ignore this arc if it's already been placed.  */
-      if (arcs[index]->has_been_placed)
+      if (the_arcs[index]->has_been_placed)
         continue;
 
-      child = arcs[index]->child;
-      parent = arcs[index]->parent;
+      child = the_arcs[index]->child;
+      parent = the_arcs[index]->parent;
 
       /* If we're not using all arcs, and this is a rarely used
@@ -1015 +1053 @@
           || child->has_been_placed || parent->has_been_placed)
         {
-          unplaced_arcs[(*unplaced_arc_count)++] = arcs[index];
+          unplaced_arcs[(*unplaced_arc_count)++] = the_arcs[index];
           continue;
         }
@@ -1025 +1063 @@
       if (parent->next && parent->prev && child->next && child->prev)
         {
-          unplaced_arcs[(*unplaced_arc_count)++] = arcs[index];
+          unplaced_arcs[(*unplaced_arc_count)++] = the_arcs[index];
           continue;
         }
@@ -1080 +1118 @@
           /* Couldn't find anywhere to attach the functions,
              put the arc on the unplaced arc list.  */
-          unplaced_arcs[(*unplaced_arc_count)++] = arcs[index];
+          unplaced_arcs[(*unplaced_arc_count)++] = the_arcs[index];
           continue;
         }
@@ -1105 +1143 @@
         {
           /* This would tie two ends together.  */
-          unplaced_arcs[(*unplaced_arc_count)++] = arcs[index];
+          unplaced_arcs[(*unplaced_arc_count)++] = the_arcs[index];
           continue;
         }
@@ -1117 +1155 @@
               parent->prev = child;
               child->next = parent;
-              arcs[index]->has_been_placed = 1;
+              the_arcs[index]->has_been_placed = 1;
             }
         }
@@ -1128 +1166 @@
               parent->next = child;
               child->prev = parent;
-              arcs[index]->has_been_placed = 1;
+              the_arcs[index]->has_been_placed = 1;
             }
         }
@@ -1140 +1178 @@
               parent->prev = child;
               child->next = parent;
-              arcs[index]->has_been_placed = 1;
+              the_arcs[index]->has_been_placed = 1;
             }
           else
@@ -1147 +1185 @@
               parent->next = child;
               child->prev = parent;
-              arcs[index]->has_been_placed = 1;
+              the_arcs[index]->has_been_placed = 1;
             }
         }
@@ -1153 +1191 @@
 
   /* Dump the chains of functions we've made.  */
-  for (index = 0; index < numarcs; index++)
+  for (index = 0; index < arc_count; index++)
     {
       Sym *sym;
-      if (arcs[index]->parent->has_been_placed
-          || arcs[index]->child->has_been_placed)
+      if (the_arcs[index]->parent->has_been_placed
+          || the_arcs[index]->child->has_been_placed)
         continue;
 
-      sym = arcs[index]->parent;
+      sym = the_arcs[index]->parent;
 
       /* If this symbol isn't attached to any other
@@ -1186 +1224 @@
      those which weren't placed by the main algorithm.  */
   if (all)
-    for (index = 0; index < numarcs; index++)
+    for (index = 0; index < arc_count; index++)
       {
         Sym *sym;
-        if (arcs[index]->parent->has_been_placed
-            || arcs[index]->child->has_been_placed)
+        if (the_arcs[index]->parent->has_been_placed
+            || the_arcs[index]->child->has_been_placed)
           continue;
 
-        sym = arcs[index]->parent;
+        sym = the_arcs[index]->parent;
 
         sym->has_been_placed = 1;
@@ -1204 +1242 @@
    code for the bulk of its work.  */
 
-struct function_map
-{
-  char *function_name;
-  char *file_name;
-};
-
 void
-DEFUN_VOID (cg_print_file_ordering)
+cg_print_file_ordering ()
 {
   unsigned long scratch_arc_count, index;
   Arc **scratch_arcs;
-  extern struct function_map *symbol_map;
-  extern unsigned int symbol_map_count;
   char *last;
 

branches/GNU/src/binutils/gprof/cg_print.h

@@ -23 +23 @@
 #define cg_print_h
 
-#include "gprof.h"
-#include "symtab.h"
-
 extern double print_time;       /* Total of time being printed.  */
 

branches/GNU/src/binutils/gprof/configure

@@ -50 +50 @@
 silent=
 site=
-sitefile=
 srcdir=
 target=NONE
@@ -165 +164 @@
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
-  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
@@ -336 +334 @@
     site="$ac_optarg" ;;
 
-  -site-file | --site-file | --site-fil | --site-fi | --site-f)
-    ac_prev=sitefile ;;
-  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-    sitefile="$ac_optarg" ;;
-
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
@@ -506 +499 @@
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$sitefile"; then
-  if test -z "$CONFIG_SITE"; then
-    if test "x$prefix" != xNONE; then
-      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-    else
-      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-    fi
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
   fi
-else
-  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
@@ -554 +543 @@
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:557: checking for Cygwin environment" >&5
+echo "configure:546: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 562 "configure"
+#line 551 "configure"
 #include "confdefs.h"
 
@@ -570 +559 @@
 ; return 0; }
 EOF
-if { (eval echo configure:573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
@@ -587 +576 @@
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:590: checking for mingw32 environment" >&5
+echo "configure:579: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 595 "configure"
+#line 584 "configure"
 #include "confdefs.h"
 
@@ -599 +588 @@
 ; return 0; }
 EOF
-if { (eval echo configure:602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
@@ -664 +653 @@
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:667: checking host system type" >&5
+echo "configure:656: checking host system type" >&5
 
 host_alias=$host
@@ -685 +674 @@
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:688: checking target system type" >&5
+echo "configure:677: checking target system type" >&5
 
 target_alias=$target
@@ -703 +692 @@
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:706: checking build system type" >&5
+echo "configure:695: checking build system type" >&5
 
 build_alias=$build
@@ -728 +717 @@
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:731: checking for $ac_word" >&5
+echo "configure:720: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -758 +747 @@
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:761: checking for $ac_word" >&5
+echo "configure:750: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -809 +798 @@
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:812: checking for $ac_word" >&5
+echo "configure:801: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -841 +830 @@
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:844: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:833: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
@@ -852 +841 @@
 cat > conftest.$ac_ext << EOF
 
-#line 855 "configure"
+#line 844 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
@@ -883 +872 @@
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:886: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:875: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:891: checking whether we are using GNU C" >&5
+echo "configure:880: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -897 +886 @@
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
@@ -916 +905 @@
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:919: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:908: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -948 +937 @@
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:951: checking for POSIXized ISC" >&5
+echo "configure:940: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
@@ -982 +971 @@
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:985: checking for a BSD compatible install" >&5
+echo "configure:974: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
@@ -1035 +1024 @@
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:1038: checking whether build environment is sane" >&5
+echo "configure:1027: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
@@ -1092 +1081 @@
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1095: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1084: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
@@ -1138 +1127 @@
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:1141: checking for working aclocal" >&5
+echo "configure:1130: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -1151 +1140 @@
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1154: checking for working autoconf" >&5
+echo "configure:1143: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -1164 +1153 @@
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:1167: checking for working automake" >&5
+echo "configure:1156: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -1177 +1166 @@
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1180: checking for working autoheader" >&5
+echo "configure:1169: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -1190 +1179 @@
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1193: checking for working makeinfo" >&5
+echo "configure:1182: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -1208 +1197 @@
   enableval="$enable_shared"
   p=${PACKAGE-default}
-case "$enableval" in
+case $enableval in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
@@ -1231 +1220 @@
   enableval="$enable_static"
   p=${PACKAGE-default}
-case "$enableval" in
+case $enableval in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
@@ -1254 +1243 @@
   enableval="$enable_fast_install"
   p=${PACKAGE-default}
-case "$enableval" in
+case $enableval in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
@@ -1282 +1271 @@
 
 ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
+if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1288: checking for ld used by GCC" >&5
+echo "configure:1277: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
@@ -1293 +1282 @@
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
   esac
-  case "$ac_prog" in
+  case $ac_prog in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
@@ -1315 +1304 @@
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1318: checking for GNU ld" >&5
+echo "configure:1307: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1321: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
+echo "configure:1310: checking for non-GNU ld" >&5
+fi
+if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1328 +1317 @@
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
+      lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
         test "$with_gnu_ld" != no && break
       else
@@ -1341 +1330 @@
   IFS="$ac_save_ifs"
 else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$ac_cv_path_LD"
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
 if test -n "$LD"; then
   echo "$ac_t""$LD" 1>&6
@@ -1353 +1342 @@
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1356: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
+echo "configure:1345: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$ac_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=yes
+else
+  lt_cv_prog_gnu_ld=no
+fi
+fi
+
+echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1373: checking for $LD option to reload object files" >&5
+echo "configure:1362: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1382 +1371 @@
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1385: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
+echo "configure:1374: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  ac_cv_path_NM="$NM"
+  lt_cv_path_NM="$NM"
 else
   IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -1400 +1389 @@
       # Tru64's nm complains that /dev/null is an invalid object file
       if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-        ac_cv_path_NM="$tmp_nm -B"
+        lt_cv_path_NM="$tmp_nm -B"
         break
       elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$tmp_nm -p"
+        lt_cv_path_NM="$tmp_nm -p"
         break
       else
-        ac_cv_path_NM=${ac_cv_path_NM="$tmp_nm"} # keep the first match, but
+        lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
         continue # so that we can try to find one that supports BSD flags
       fi
@@ -1412 +1401 @@
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-fi
-fi
-
-NM="$ac_cv_path_NM"
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+fi
+fi
+
+NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1423: checking whether ln -s works" >&5
+echo "configure:1412: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1441 +1430 @@
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:1444: checking how to recognise dependant libraries" >&5
+echo "configure:1433: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1459 +1448 @@
 # whether `pass_all' will *always* work, you probably want this one.
 
-case "$host_os" in
-aix4*)
+case $host_os in
+aix*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -1469 +1458 @@
 
 bsdi4*)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-    lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
@@ -1479 +1468 @@
   ;;
 
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  case "$host_os" in
+  rhapsody* | darwin1.012)
+    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
+    ;;
+  *) # Darwin 1.3 on
+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+    ;;
+  esac
+  ;;
+
 freebsd* )
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case "$host_cpu" in
+    case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-            lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-            lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -1499 +1501 @@
   ;;
 
-hpux10.20*)
-  # TODO:  Does this work for hpux-11 too?
-  lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9.0-9) shared library'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+hpux10.20*|hpux11*)
+  case $host_cpu in
+  hppa*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_file_magic_cmd=/usr/bin/file
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_cmd=/usr/bin/file
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  esac
   ;;
 
 irix5* | irix6*)
-  case "$host_os" in
+  case $host_os in
   irix5*)
     # this will be overridden with pass_all, but let us keep it just in case
@@ -1513 +1523 @@
     ;;
   *)
-    case "$LD" in
+    case $LD in
     *-32|*"-32 ") libmagic=32-bit;;
     *-n32|*"-n32 ") libmagic=N32;;
@@ -1520 +1530 @@
     esac
     # this will be overridden with pass_all, but let us keep it just in case
-        lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-        ;;
+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+    ;;
   esac
   lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
@@ -1529 +1539 @@
 # This must be Linux ELF.
 linux-gnu*)
-  case "$host_cpu" in
-  alpha* | i*86 | powerpc* | sparc* | ia64* )
+  case $host_cpu in
+  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
     lt_cv_deplibs_check_method=pass_all ;;
   *)
     # glibc up to 2.1.1 does not perform some relocations on ARM
-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-      esac
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+  esac
   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   ;;
 
 netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then :
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
   else
-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-        lt_cv_file_magic_cmd='/usr/bin/file -L'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
   fi
+  ;;
+
+newsos6)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
@@ -1564 +1579 @@
   ;;
 
+sysv5uw[78]* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case "$host_vendor" in
+  case $host_vendor in
   ncr)
     lt_cv_deplibs_check_method=pass_all
     ;;
   motorola)
-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
     ;;
   esac
@@ -1584 +1603 @@
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1587: checking for object suffix" >&5
+echo "configure:1606: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1590 +1609 @@
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
@@ -1610 +1629 @@
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1613: checking for executable suffix" >&5
+echo "configure:1632: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1620 +1639 @@
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+      *.c | *.o | *.obj) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
@@ -1649 +1668 @@
 
 # Only perform the check for file, if the check method requires it
-case "$deplibs_check_method" in
+case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:1656: checking for ${ac_tool_prefix}file" >&5
+echo "configure:1675: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$MAGIC_CMD" in
+  case $MAGIC_CMD in
   /*)
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
@@ -1673 +1692 @@
       lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
       if test -n "$file_magic_test_file"; then
-        case "$deplibs_check_method" in
+        case $deplibs_check_method in
         "file_magic "*)
           file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
@@ -1715 +1734 @@
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:1718: checking for file" >&5
+echo "configure:1737: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$MAGIC_CMD" in
+  case $MAGIC_CMD in
   /*)
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
@@ -1735 +1754 @@
       lt_cv_path_MAGIC_CMD="$ac_dir/file"
       if test -n "$file_magic_test_file"; then
-        case "$deplibs_check_method" in
+        case $deplibs_check_method in
         "file_magic "*)
           file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
@@ -1786 +1805 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1789: checking for $ac_word" >&5
+echo "configure:1808: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1818 +1837 @@
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1821: checking for $ac_word" >&5
+echo "configure:1840: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1853 +1872 @@
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1856: checking for $ac_word" >&5
+echo "configure:1875: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1885 +1904 @@
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1888: checking for $ac_word" >&5
+echo "configure:1907: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1923 +1942 @@
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 
 
@@ -1949 +1968 @@
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case "$host" in
+case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1955 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
+  echo '#line 1974 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -1969 +1988 @@
   ;;
 
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo configure:1994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
@@ -1974 +2009 @@
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1977: checking whether the C compiler needs -belf" >&5
+echo "configure:2012: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1987 +2022 @@
 
      cat > conftest.$ac_ext <<EOF
-#line 1990 "configure"
+#line 2025 "configure"
 #include "confdefs.h"
 
@@ -1994 +2029 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
@@ -2104 +2139 @@
 exec 5>>./config.log
 
-
   
 
@@ -2118 +2152 @@
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2121: checking for $ac_word" >&5
+echo "configure:2155: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2148 +2182 @@
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2151: checking for $ac_word" >&5
+echo "configure:2185: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2199 +2233 @@
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2202: checking for $ac_word" >&5
+echo "configure:2236: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2231 +2265 @@
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2234: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2268: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
@@ -2242 +2276 @@
 cat > conftest.$ac_ext << EOF
 
-#line 2245 "configure"
+#line 2279 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
@@ -2273 +2307 @@
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2276: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2310: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2281: checking whether we are using GNU C" >&5
+echo "configure:2315: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2287 +2321 @@
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
@@ -2306 +2340 @@
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2309: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2343: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2349 +2383 @@
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2352: checking for a BSD compatible install" >&5
+echo "configure:2386: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
@@ -2405 +2439 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2408: checking for $ac_func" >&5
+echo "configure:2442: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2413 "configure"
+#line 2447 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2433 +2467 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2458 +2492 @@
 
 
-ALL_LINGUAS=
+ALL_LINGUAS="fr tr sv es id da pt_BR"
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2463: checking how to run the C preprocessor" >&5
+echo "configure:2497: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2475 +2509 @@
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2478 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 2495 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
 #line 2512 "configure"
 #include "confdefs.h"
@@ -2524 +2524 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 2529 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 2546 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
   CPP=/lib/cpp
 fi
@@ -2542 +2576 @@
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2545: checking for $ac_word" >&5
+echo "configure:2579: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2570 +2604 @@
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2573: checking for ANSI C header files" >&5
+echo "configure:2607: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2578 "configure"
+#line 2612 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -2583 +2617 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -2600 +2634 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2603 "configure"
+#line 2637 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -2618 +2652 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2621 "configure"
+#line 2655 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -2639 +2673 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2642 "configure"
+#line 2676 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -2650 +2684 @@
 
 EOF
-if { (eval echo configure:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
@@ -2674 +2708 @@
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2677: checking for working const" >&5
+echo "configure:2711: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2682 "configure"
+#line 2716 "configure"
 #include "confdefs.h"
 
@@ -2728 +2762 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -2749 +2783 @@
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2752: checking for inline" >&5
+echo "configure:2786: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2756 +2790 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2759 "configure"
+#line 2793 "configure"
 #include "confdefs.h"
 
@@ -2763 +2797 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -2789 +2823 @@
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2792: checking for off_t" >&5
+echo "configure:2826: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2797 "configure"
+#line 2831 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2822 +2856 @@
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2825: checking for size_t" >&5
+echo "configure:2859: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2830 "configure"
+#line 2864 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2857 +2891 @@
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2860: checking for working alloca.h" >&5
+echo "configure:2894: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2865 "configure"
+#line 2899 "configure"
 #include "confdefs.h"
 #include <alloca.h>
@@ -2869 +2903 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
@@ -2890 +2924 @@
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2893: checking for alloca" >&5
+echo "configure:2927: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2898 "configure"
+#line 2932 "configure"
 #include "confdefs.h"
 
@@ -2923 +2957 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
@@ -2955 +2989 @@
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2958: checking whether alloca needs Cray hooks" >&5
+echo "configure:2992: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2963 "configure"
+#line 2997 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
@@ -2985 +3019 @@
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2988: checking for $ac_func" >&5
+echo "configure:3022: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2993 "configure"
+#line 3027 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3013 +3047 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -3040 +3074 @@
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:3043: checking stack direction for C alloca" >&5
+echo "configure:3077: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3048 +3082 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3051 "configure"
+#line 3085 "configure"
 #include "confdefs.h"
 find_stack_direction ()
@@ -3067 +3101 @@
 }
 EOF
-if { (eval echo configure:3070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
@@ -3088 +3122 @@
 fi
 
-for ac_hdr in unistd.h
+for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3095: checking for $ac_hdr" >&5
+echo "configure:3129: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3100 "configure"
+#line 3134 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -3131 +3165 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3134: checking for $ac_func" >&5
+echo "configure:3168: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3139 "configure"
+#line 3173 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3159 +3193 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -3184 +3218 @@
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3187: checking for working mmap" >&5
+echo "configure:3221: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3192 +3226 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3195 "configure"
+#line 3229 "configure"
 #include "confdefs.h"
 
@@ -3220 +3254 @@
 #include <sys/mman.h>
 
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
 
 /* Assume that all systems that can run configure have sys/param.h.  */
@@ -3332 +3379 @@
 
 EOF
-if { (eval echo configure:3335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
@@ -3360 +3407 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3363: checking for $ac_hdr" >&5
+echo "configure:3410: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3368 "configure"
+#line 3415 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -3400 +3447 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3403: checking for $ac_func" >&5
+echo "configure:3450: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3408 "configure"
+#line 3455 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3428 +3475 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -3457 +3504 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3460: checking for $ac_func" >&5
+echo "configure:3507: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3465 "configure"
+#line 3512 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3485 +3532 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -3519 +3566 @@
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3522: checking for LC_MESSAGES" >&5
+echo "configure:3569: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3527 "configure"
+#line 3574 "configure"
 #include "confdefs.h"
 #include <locale.h>
@@ -3531 +3578 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
@@ -3552 +3599 @@
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3555: checking whether NLS is requested" >&5
+echo "configure:3602: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
@@ -3572 +3619 @@
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3575: checking whether included gettext is requested" >&5
+echo "configure:3622: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
@@ -3591 +3638 @@
         ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3594: checking for libintl.h" >&5
+echo "configure:3641: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3599 "configure"
+#line 3646 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -3618 +3665 @@
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:3621: checking for gettext in libc" >&5
+echo "configure:3668: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3626 "configure"
+#line 3673 "configure"
 #include "confdefs.h"
 #include <libintl.h>
@@ -3630 +3677 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
@@ -3646 +3693 @@
            if test "$gt_cv_func_gettext_libc" != "yes"; then
              echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3649: checking for bindtextdomain in -lintl" >&5
+echo "configure:3696: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -3654 +3701 @@
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3657 "configure"
+#line 3704 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3665 +3712 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -3681 +3728 @@
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:3684: checking for gettext in libintl" >&5
+echo "configure:3731: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3689 "configure"
+#line 3736 "configure"
 #include "confdefs.h"
 
@@ -3693 +3740 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libintl=yes
@@ -3721 +3768 @@
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3724: checking for $ac_word" >&5
+echo "configure:3771: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3755 +3802 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3758: checking for $ac_func" >&5
+echo "configure:3805: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3763 "configure"
+#line 3810 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3783 +3830 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -3810 +3857 @@
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3813: checking for $ac_word" >&5
+echo "configure:3860: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3846 +3893 @@
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3849: checking for $ac_word" >&5
+echo "configure:3896: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3878 +3925 @@
 
                 cat > conftest.$ac_ext <<EOF
-#line 3881 "configure"
+#line 3928 "configure"
 #include "confdefs.h"
 
@@ -3886 +3933 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
@@ -3918 +3965 @@
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3921: checking for $ac_word" >&5
+echo "configure:3968: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3952 +3999 @@
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3955: checking for $ac_word" >&5
+echo "configure:4002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3988 +4035 @@
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3991: checking for $ac_word" >&5
+echo "configure:4038: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4078 +4125 @@
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4081: checking for catalogs to be installed" >&5
+echo "configure:4128: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
@@ -4106 +4153 @@
          ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:4109: checking for linux/version.h" >&5
+echo "configure:4156: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4114 "configure"
+#line 4161 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -4161 +4208 @@
    
 
-            if test -d $srcdir/po; then
+            if test -f $srcdir/po/POTFILES.in; then
       test -d po || mkdir po
       if test "x$srcdir" != "x."; then
@@ -4179 +4226 @@
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:4182: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:4229: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
@@ -4204 +4251 @@
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:4207: checking for executable suffix" >&5
+echo "configure:4254: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4214 +4261 @@
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:4217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:4264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+      *.c | *.o | *.obj) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
@@ -4239 +4286 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4242: checking for $ac_hdr" >&5
+echo "configure:4289: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4247 "configure"
+#line 4294 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -4276 +4323 @@
 
 
-echo $ac_n "checking the size of gmon pointers""... $ac_c" 1>&6
-echo "configure:4280: checking the size of gmon pointers" >&5
-if test "$cross_compiling" = yes; then
-  gmon_ptr_size=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4285 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#include <stdlib.h>
-#if HAVE_SYS_GMON_OUT_H
-#include <sys/gmon_out.h>
-#endif
-main()
-{
-#if HAVE_SYS_GMON_OUT_H
-  struct gmon_cg_arc_record arc;
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(arc.from_pc));
-  exit(0);
-#else
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", (int) sizeof(char *));
-  exit(1);
-#endif
-}
-EOF
-if { (eval echo configure:4308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  gmon_ptr_size=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  gmon_ptr_size=4
-fi
-rm -fr conftest*
-fi
-
-echo "$ac_t""$gmon_ptr_size" 1>&6
-
-cat >> confdefs.h <<EOF
-#define GMON_PTR_SIZE $gmon_ptr_size
-EOF
-
-
-build_warnings="-W -Wall"
+build_warnings="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 # Check whether --enable-build-warnings or --disable-build-warnings was given.
 if test "${enable_build_warnings+set}" = set; then

branches/GNU/src/binutils/gprof/configure.in

@@ -24 +24 @@
 AC_CHECK_FUNCS(setmode)
 
-ALL_LINGUAS=
+ALL_LINGUAS="fr tr sv es id da pt_BR"
 CY_GNU_GETTEXT
 
@@ -32 +32 @@
 AC_CHECK_HEADERS(sys/gmon_out.h)
 
-AC_MSG_CHECKING(the size of gmon pointers)
-AC_TRY_RUN([#include <stdio.h>
-#include <stdlib.h>
-#if HAVE_SYS_GMON_OUT_H
-#include <sys/gmon_out.h>
-#endif
-main()
-{
-#if HAVE_SYS_GMON_OUT_H
-  struct gmon_cg_arc_record arc;
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(arc.from_pc));
-  exit(0);
-#else
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", (int) sizeof(char *));
-  exit(1);
-#endif
-}], gmon_ptr_size=`cat conftestval`, gmon_ptr_size=4, gmon_ptr_size=4)
-AC_MSG_RESULT($gmon_ptr_size)
-
-AC_DEFINE_UNQUOTED(GMON_PTR_SIZE, $gmon_ptr_size)
-
-build_warnings="-W -Wall"
+build_warnings="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 AC_ARG_ENABLE(build-warnings,
 [  --enable-build-warnings Enable build-time compiler warnings if gcc is used],

branches/GNU/src/binutils/gprof/corefile.c

@@ -1 +1 @@
 /* corefile.c
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -23 +23 @@
 #include "libiberty.h"
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "corefile.h"
-#include "symtab.h"
 
 bfd *core_bfd;
@@ -36 +38 @@
 
 /* For mapping symbols to specific .o files during file ordering.  */
-struct function_map
-{
-  char *function_name;
-  char *file_name;
-};
-
 struct function_map *symbol_map;
 unsigned int symbol_map_count;
+
+static void read_function_mappings PARAMS ((const char *));
+static int core_sym_class PARAMS ((asymbol *));
+static bfd_boolean get_src_info
+  PARAMS ((bfd_vma, const char **, const char **, int *));
 
 extern void i386_find_call  PARAMS ((Sym *, bfd_vma, bfd_vma));
@@ -50 +51 @@
 extern void tahoe_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
 extern void sparc_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
+extern void mips_find_call  PARAMS ((Sym *, bfd_vma, bfd_vma));
 
 static void
-DEFUN (read_function_mappings, (filename), const char *filename)
+read_function_mappings (filename)
+     const char *filename;
 {
   FILE *file = fopen (filename, "r");
@@ -138 +141 @@
 
 void
-DEFUN (core_init, (a_out_name), const char *a_out_name)
+core_init (aout_name)
+     const char *aout_name;
 {
-  core_bfd = bfd_openr (a_out_name, 0);
+  core_bfd = bfd_openr (aout_name, 0);
 
   if (!core_bfd)
     {
-      perror (a_out_name);
+      perror (aout_name);
       done (1);
     }
@@ -150 +154 @@
   if (!bfd_check_format (core_bfd, bfd_object))
     {
-      fprintf (stderr, _("%s: %s: not in a.out format\n"), whoami, a_out_name);
+      fprintf (stderr, _("%s: %s: not in a.out format\n"), whoami, aout_name);
       done (1);
     }
@@ -162 +166 @@
         {
           fprintf (stderr, _("%s: can't find .text section in %s\n"),
-                   whoami, a_out_name);
+                   whoami, aout_name);
           done (1);
         }
@@ -173 +177 @@
   if (core_num_syms < 0)
     {
-      fprintf (stderr, "%s: %s: %s\n", whoami, a_out_name,
+      fprintf (stderr, "%s: %s: %s\n", whoami, aout_name,
                bfd_errmsg (bfd_get_error ()));
       done (1);
@@ -183 +187 @@
   if (core_num_syms < 0)
     {
-      fprintf (stderr, "%s: %s: %s\n", whoami, a_out_name,
+      fprintf (stderr, "%s: %s: %s\n", whoami, aout_name,
                bfd_errmsg (bfd_get_error ()));
       done (1);
@@ -213 +217 @@
 
 void
-DEFUN (core_get_text_space, (core_bfd), bfd * core_bfd)
+core_get_text_space (cbfd)
+     bfd *cbfd;
 {
-  core_text_space = (PTR) malloc (core_text_sect->_raw_size);
+  core_text_space = (PTR) malloc ((unsigned int) core_text_sect->_raw_size);
 
   if (!core_text_space)
@@ -224 +229 @@
     }
 
-  if (!bfd_get_section_contents (core_bfd, core_text_sect, core_text_space,
-                                 0, core_text_sect->_raw_size))
+  if (!bfd_get_section_contents (cbfd, core_text_sect, core_text_space,
+                                 (bfd_vma) 0, core_text_sect->_raw_size))
     {
       bfd_perror ("bfd_get_section_contents");
@@ -238 +243 @@
 
 void
-DEFUN (find_call, (parent, p_lowpc, p_highpc),
-       Sym * parent AND bfd_vma p_lowpc AND bfd_vma p_highpc)
+find_call (parent, p_lowpc, p_highpc)
+     Sym *parent;
+     bfd_vma p_lowpc;
+     bfd_vma p_highpc;
 {
   switch (bfd_get_arch (core_bfd))
@@ -261 +268 @@
     case bfd_arch_tahoe:
       tahoe_find_call (parent, p_lowpc, p_highpc);
+      break;
+
+    case bfd_arch_mips:
+      mips_find_call (parent, p_lowpc, p_highpc);
       break;
 
@@ -278 +289 @@
 
 static int
-DEFUN (core_sym_class, (sym), asymbol * sym)
+core_sym_class (sym)
+     asymbol *sym;
 {
   symbol_info syminfo;
@@ -360 +372 @@
 /* Get whatever source info we can get regarding address ADDR.  */
 
-static bool
-DEFUN (get_src_info, (addr, filename, name, line_num),
-       bfd_vma addr AND const char **filename AND const char **name
-       AND int *line_num)
+static bfd_boolean
+get_src_info (addr, filename, name, line_num)
+     bfd_vma addr;
+     const char **filename;
+     const char **name;
+     int *line_num;
 {
   const char *fname = 0, *func_name = 0;
@@ -393 +407 @@
 
 void
-core_create_function_syms (core_bfd)
-     bfd *core_bfd ATTRIBUTE_UNUSED;
+core_create_function_syms (cbfd)
+     bfd *cbfd ATTRIBUTE_UNUSED;
 {
-  bfd_vma min_vma = ~0, max_vma = 0;
+  bfd_vma min_vma = ~(bfd_vma) 0;
+  bfd_vma max_vma = 0;
   int class;
   long i, found, skip;
@@ -529 +544 @@
         symtab.limit->is_static = TRUE;
 
+      /* Keep track of the minimum and maximum vma addresses used by all
+         symbols.  When computing the max_vma, use the ending address of the
+         section containing the symbol, if available.  */
       min_vma = MIN (symtab.limit->addr, min_vma);
-      max_vma = MAX (symtab.limit->addr, max_vma);
+      if (core_syms[i]->section)
+        max_vma = MAX (core_syms[i]->section->vma
+                       + core_syms[i]->section->_cooked_size - 1, max_vma);
+      else
+        max_vma = MAX (symtab.limit->addr, max_vma);
 
       /* If we see "main" without an initial '_', we assume names
@@ -555 +577 @@
   symtab.limit->name = "<hicore>";
   symtab.limit->addr = max_vma + 1;
-  symtab.limit->end_addr = ~0;
+  symtab.limit->end_addr = ~(bfd_vma) 0;
   ++symtab.limit;
 
@@ -566 +588 @@
 
 void
-DEFUN (core_create_line_syms, (core_bfd), bfd * core_bfd)
+core_create_line_syms (cbfd)
+     bfd *cbfd;
 {
   char *prev_name, *prev_filename;
-  int prev_name_len, prev_filename_len;
-  bfd_vma vma, min_vma = ~0, max_vma = 0;
+  unsigned int prev_name_len, prev_filename_len;
+  bfd_vma vma, min_vma = ~(bfd_vma) 0, max_vma = 0;
   bfd_vma offset;
   Sym *prev, dummy, *sentinel, *sym;
@@ -580 +603 @@
      cases where parts of a program were not compiled with -g.  For
      those parts we still want to get info at the function level.  */
-  core_create_function_syms (core_bfd);
+  core_create_function_syms (cbfd);
 
   /* Pass 1 - counter number of symbols.  */
@@ -600 +623 @@
   for (offset = 0; offset < core_text_sect->_raw_size; offset += min_insn_size)
     {
-      int len;
+      unsigned int len;
 
       vma = core_text_sect->vma + offset;
@@ -713 +736 @@
 
   /* Update sentinels.  */
-  sentinel = sym_lookup (&symtab, 0);
-
-  if (strcmp (sentinel->name, "<locore>") == 0
+  sentinel = sym_lookup (&symtab, (bfd_vma) 0);
+
+  if (sentinel
+      && strcmp (sentinel->name, "<locore>") == 0
       && min_vma <= sentinel->end_addr)
     sentinel->end_addr = min_vma - 1;
 
-  sentinel = sym_lookup (&symtab, ~0);
-
-  if (strcmp (sentinel->name, "<hicore>") == 0 && max_vma >= sentinel->addr)
+  sentinel = sym_lookup (&symtab, ~(bfd_vma) 0);
+
+  if (sentinel
+      && strcmp (sentinel->name, "<hicore>") == 0
+      && max_vma >= sentinel->addr)
     sentinel->addr = max_vma + 1;
 

branches/GNU/src/binutils/gprof/corefile.h

@@ -1 +1 @@
 /* corefile.h
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Binutils.
@@ -23 +23 @@
 #define corefile_h
 
-#include "bfd.h"
+struct function_map
+{
+  char *function_name;
+  char *file_name;
+};
+
+extern struct function_map *symbol_map;
+extern unsigned int symbol_map_count;
 
 extern bfd *core_bfd;           /* BFD for core-file.  */

branches/GNU/src/binutils/gprof/dep-in.sed

@@ -4 +4 @@
 
 s!@INCDIR@!$(INCDIR)!g
+s!@TOPDIR@/include!$(INCDIR)!g
 s!@BFDDIR@!$(BFDDIR)!g
+s!@TOPDIR@/bfd!$(BFDDIR)!g
 s!@SRCDIR@/!!g
 s!@OBJDIR@/!!g

branches/GNU/src/binutils/gprof/flat_bl.c

@@ -3 +3 @@
 
 #include <stdio.h>
+#include "ansidecl.h"
 
+void  flat_blurb PARAMS ((FILE *));
 void
 flat_blurb (file)

branches/GNU/src/binutils/gprof/fsf_callg_bl.c

@@ -3 +3 @@
 
 #include <stdio.h>
+#include "ansidecl.h"
 
+void  fsf_callg_blurb PARAMS ((FILE *));
 void
 fsf_callg_blurb (file)

branches/GNU/src/binutils/gprof/gconfig.in

@@ -43 +43 @@
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
-
-/* Define as the size of a pointer in the target profile file format.  */
-#undef GMON_PTR_SIZE
 
 /* Define if you have the __argz_count function.  */
@@ -104 +101 @@
 #undef HAVE_NL_TYPES_H
 
+/* Define if you have the <stdlib.h> header file.  */
+#undef HAVE_STDLIB_H
+
 /* Define if you have the <string.h> header file.  */
 #undef HAVE_STRING_H
@@ -112 +112 @@
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
+
+/* Define if you have the <sys/stat.h> header file.  */
+#undef HAVE_SYS_STAT_H
+
+/* Define if you have the <sys/types.h> header file.  */
+#undef HAVE_SYS_TYPES_H
 
 /* Define if you have the <unistd.h> header file.  */

branches/GNU/src/binutils/gprof/gen-c-prog.awk

@@ -4 +4 @@
     printf "   from %s using the gen-c-prog.awk script.  <== */\n\n", FILE
     print "#include <stdio.h>"
+    print "#include \"ansidecl.h\""
 }
 
@@ -13 +14 @@
               curfun = FUNCTION
               print ""
+              print "void ", FUNCTION, "PARAMS ((FILE *));"
               print "void";
               printf "%s (file)\n", FUNCTION

branches/GNU/src/binutils/gprof/gmon.h

@@ -1 @@
-/*-
- * Copyright (c) 1991, 2001 The Regents of the University of California.
- * All rights reserved.
+/*
+ * Copyright (c) 1983, 1991, 1993, 2001
+ *      The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11 +11 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -30 +26 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *      @(#)gmon.h      5.2 (Berkeley) 5/6/91
  */
 #ifndef gmon_h
 #define gmon_h
 
-struct raw_phdr
-  {
-    /* FIXME: Checking a host compiler define means that we can't use
-       a cross gprof to the alpha.  */
-    char low_pc[GMON_PTR_SIZE]; /* base pc address of sample buffer */
-    char high_pc[GMON_PTR_SIZE];/* max pc address of sampled buffer */
-    char ncnt[4];               /* size of sample buffer (plus this header) */
+/* Size of the 4.4BSD gmon header */
+#define GMON_HDRSIZE_BSD44_32 (4 + 4 + 4 + 4 + 4 + (3 * 4))
+#define GMON_HDRSIZE_BSD44_64 (8 + 8 + 4 + 4 + 4 + (3 * 4))
 
-    char version[4];            /* version number */
-    char profrate[4];           /* profiling clock rate */
-    char spare[3*4];            /* reserved */
-  };
+#if 0 /* For documentation purposes only.  */
+  struct raw_phdr
+    {
+      char low_pc[sizeof(void *)]; /* base pc address of sample buffer */
+      char high_pc[sizeof(void *)];/* max pc address of sampled buffer */
+      char ncnt[4];                /* size of sample buffer (plus this
+                                      header) */
+
+      char version[4];             /* version number */
+      char profrate[4];            /* profiling clock rate */
+      char spare[3*4];             /* reserved */
+    };
+#endif
 
 #define GMONVERSION     0x00051879
 
-struct old_raw_phdr
-  {
-    char low_pc[GMON_PTR_SIZE]; /* base pc address of sample buffer */
-    char high_pc[GMON_PTR_SIZE];/* max pc address of sampled buffer */
-    char ncnt[4];               /* size of sample buffer (plus this header) */
+/* Size of the old BSD gmon header */
+#define GMON_HDRSIZE_OLDBSD_32 (4 + 4 + 4) 
 
-    /* FIXME: Checking host compiler defines here means that we can't
-       use a cross gprof alpha OSF.  */
+/* FIXME: Checking host compiler defines here means that we can't
+   use a cross gprof alpha OSF.  */
+#if defined(__alpha__) && defined (__osf__) 
+#define GMON_HDRSIZE_OLDBSD_64 (8 + 8 + 4 + 4)
+#else
+#define GMON_HDRSIZE_OLDBSD_64 (8 + 8 + 4)
+#endif
+
+#if 0 /* For documentation purposes only.  */
+  struct old_raw_phdr
+    {
+      char low_pc[sizeof(void *)]; /* base pc address of sample buffer */
+      char high_pc[sizeof(void *)];/* max pc address of sampled buffer */
+      char ncnt[4];                /* size of sample buffer (plus this
+                                      header) */
 #if defined (__alpha__) && defined (__osf__)
-    /*
-     * DEC's OSF v3.0 uses 4 bytes of padding to bring the header to
-     * a size that is a multiple of 8.
-     */
-    char pad[4];
+      /*
+       * DEC's OSF v3.0 uses 4 bytes of padding to bring the header to
+       * a size that is a multiple of 8.
+       */
+      char pad[4];
 #endif
-  };
+    };
+#endif
 
 /*
@@ -121 +131 @@
  * might introduce different padding):
  */
-struct raw_arc
-  {
-    char from_pc[GMON_PTR_SIZE];
-    char self_pc[GMON_PTR_SIZE];
-    char count[4];
-  };
+#if 0 /* For documentation purposes only.  */
+  struct raw_arc
+    {
+      char from_pc[sizeof(void *)];
+      char self_pc[sizeof(void *)];
+      char count[sizeof(long)];
+    };
+#endif
 
 /*

branches/GNU/src/binutils/gprof/gmon_io.c

@@ -1 +1 @@
 /* gmon_io.c - Input and output from/to gmon.out files.
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -21 +21 @@
 
 
+#include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
 #include "basic_blocks.h"
-#include "bfd.h"
 #include "corefile.h"
 #include "call_graph.h"
@@ -29 +32 @@
 #include "gmon_out.h"
 #include "gmon.h"               /* Fetch header for old format.  */
-#include "gprof.h"
 #include "hertz.h"
 #include "hist.h"
 #include "libiberty.h"
 
+enum gmon_ptr_size {
+  ptr_32bit,
+  ptr_64bit
+};
+
+enum gmon_ptr_signedness {
+  ptr_signed,
+  ptr_unsigned
+};
+
+static enum gmon_ptr_size gmon_get_ptr_size PARAMS ((void));
+static enum gmon_ptr_signedness gmon_get_ptr_signedness PARAMS ((void));
+
+#ifdef BFD_HOST_U_64_BIT
+static int gmon_io_read_64 PARAMS ((FILE *, BFD_HOST_U_64_BIT *));
+static int gmon_io_write_64 PARAMS ((FILE *, BFD_HOST_U_64_BIT));
+#endif
+static int gmon_read_raw_arc
+  PARAMS ((FILE *, bfd_vma *, bfd_vma *, unsigned long *));
+static int gmon_write_raw_arc
+  PARAMS ((FILE *, bfd_vma, bfd_vma, unsigned long));
+
 int gmon_input = 0;
 int gmon_file_version = 0;      /* 0 == old (non-versioned) file format.  */
 
+static enum gmon_ptr_size
+gmon_get_ptr_size ()
+{
+  int size;
+
+  /* Pick best size for pointers.  Start with the ELF size, and if not
+     elf go with the architecture's address size.  */
+  size = bfd_get_arch_size (core_bfd);
+  if (size == -1)
+    size = bfd_arch_bits_per_address (core_bfd);
+
+  switch (size)
+    {
+    case 32:
+      return ptr_32bit;
+
+    case 64:
+      return ptr_64bit;
+
+    default:
+      fprintf (stderr, _("%s: address size has unexpected value of %u\n"),
+               whoami, size);
+      done (1);
+    }
+}
+
+static enum gmon_ptr_signedness
+gmon_get_ptr_signedness ()
+{
+  int sext;
+
+  /* Figure out whether to sign extend.  If BFD doesn't know, assume no.  */
+  sext = bfd_get_sign_extend_vma (core_bfd);
+  if (sext == -1)
+    return ptr_unsigned;
+  return (sext ? ptr_signed : ptr_unsigned);
+}
+
 int
-DEFUN (gmon_io_read_vma, (ifp, valp), FILE * ifp AND bfd_vma *valp)
+gmon_io_read_32 (ifp, valp)
+     FILE *ifp;
+     unsigned int *valp;
+{
+  char buf[4];
+
+  if (fread (buf, 1, 4, ifp) != 4)
+    return 1;
+  *valp = bfd_get_32 (core_bfd, buf);
+  return 0;
+}
+
+#ifdef BFD_HOST_U_64_BIT
+static int
+gmon_io_read_64 (ifp, valp)
+     FILE *ifp;
+     BFD_HOST_U_64_BIT *valp;
 {
   char buf[8];
-  bfd_vma val;
-
-  switch (GMON_PTR_SIZE)
-    {
-    case 4:
-      if (fread (buf, 1, 4, ifp) != 4)
+
+  if (fread (buf, 1, 8, ifp) != 8)
+    return 1;
+  *valp = bfd_get_64 (core_bfd, buf);
+  return 0;
+}
+#endif
+
+int
+gmon_io_read_vma (ifp, valp)
+     FILE *ifp;
+     bfd_vma *valp;
+{
+  unsigned int val32;
+#ifdef BFD_HOST_U_64_BIT
+  BFD_HOST_U_64_BIT val64;
+#endif
+
+  switch (gmon_get_ptr_size ())
+    {
+    case ptr_32bit:
+      if (gmon_io_read_32 (ifp, &val32))
         return 1;
-      val = bfd_get_32 (core_bfd, buf);
+      if (gmon_get_ptr_signedness () == ptr_signed)
+        *valp = (int) val32;
+      else
+        *valp = val32;
       break;
 
-    case 8:
-      if (fread (buf, 1, 8, ifp) != 8)
+#ifdef BFD_HOST_U_64_BIT
+    case ptr_64bit:
+      if (gmon_io_read_64 (ifp, &val64))
         return 1;
-      val = bfd_get_64 (core_bfd, buf);
+#ifdef BFD_HOST_64_BIT
+      if (gmon_get_ptr_signedness () == ptr_signed)
+        *valp = (BFD_HOST_64_BIT) val64;
+      else
+#endif
+        *valp = val64;
       break;
-
-    default:
-      fprintf (stderr, _("%s: GMON_PTR_SIZE has unexpected value of %u\n"),
-               whoami, GMON_PTR_SIZE);
-      done (1);
-    }
-  *valp = val;
+#endif
+    }
   return 0;
 }
 
 int
-DEFUN (gmon_io_read_32, (ifp, valp), FILE * ifp AND unsigned int *valp)
+gmon_io_read (ifp, buf, n)
+     FILE *ifp;
+     char *buf;
+     size_t n;
+{
+  if (fread (buf, 1, n, ifp) != n)
+    return 1;
+  return 0;
+}
+
+int
+gmon_io_write_32 (ofp, val)
+     FILE *ofp;
+     unsigned int val;
 {
   char buf[4];
 
-  if (fread (buf, 1, 4, ifp) != 4)
-    return 1;
-  *valp = bfd_get_32 (core_bfd, buf);
-  return 0;
-}
+  bfd_put_32 (core_bfd, (bfd_vma) val, buf);
+  if (fwrite (buf, 1, 4, ofp) != 4)
+    return 1;
+  return 0;
+}
+
+#ifdef BFD_HOST_U_64_BIT
+static int
+gmon_io_write_64 (ofp, val)
+     FILE *ofp; 
+     BFD_HOST_U_64_BIT val;
+{
+  char buf[8];
+
+  bfd_put_64 (core_bfd, (bfd_vma) val, buf);
+  if (fwrite (buf, 1, 8, ofp) != 8)
+    return 1;
+  return 0;
+}
+#endif
 
 int
-DEFUN (gmon_io_read, (ifp, buf, n), FILE * ifp AND char *buf AND size_t n)
-{
-  if (fread (buf, 1, n, ifp) != n)
-    return 1;
-  return 0;
-}
-
-int
-DEFUN (gmon_io_write_vma, (ofp, val), FILE * ofp AND bfd_vma val)
-{
-  char buf[8];
-
-  switch (GMON_PTR_SIZE)
-    {
-    case 4:
-      bfd_put_32 (core_bfd, val, buf);
-      if (fwrite (buf, 1, 4, ofp) != 4)
+gmon_io_write_vma (ofp, val)
+     FILE *ofp;
+     bfd_vma val;
+{
+
+  switch (gmon_get_ptr_size ())
+    {
+    case ptr_32bit:
+      if (gmon_io_write_32 (ofp, (unsigned int) val))
         return 1;
       break;
 
-    case 8:
-      bfd_put_64 (core_bfd, val, buf);
-      if (fwrite (buf, 1, 8, ofp) != 8)
+#ifdef BFD_HOST_U_64_BIT
+    case ptr_64bit:
+      if (gmon_io_write_64 (ofp, (BFD_HOST_U_64_BIT) val))
         return 1;
       break;
-
-    default:
-      fprintf (stderr, _("%s: GMON_PTR_SIZE has unexpected value of %u\n"),
-               whoami, GMON_PTR_SIZE);
-      done (1);
+#endif
     }
   return 0;
@@ -113 +227 @@
 
 int
-DEFUN (gmon_io_write_32, (ofp, val), FILE * ofp AND unsigned int val)
-{
-  char buf[4];
-
-  bfd_put_32 (core_bfd, val, buf);
-  if (fwrite (buf, 1, 4, ofp) != 4)
-    return 1;
-  return 0;
-}
-
-int
-DEFUN (gmon_io_write_8, (ofp, val), FILE * ofp AND unsigned char val)
+gmon_io_write_8 (ofp, val)
+     FILE *ofp; 
+     unsigned int val;
 {
   char buf[1];
@@ -135 +240 @@
 
 int
-DEFUN (gmon_io_write, (ofp, buf, n), FILE * ofp AND char *buf AND size_t n)
+gmon_io_write (ofp, buf, n)
+     FILE *ofp; 
+     char *buf;
+     size_t n;
 {
   if (fwrite (buf, 1, n, ofp) != n)
@@ -142 +250 @@
 }
 
-/* get_vma and put_vma are for backwards compatibility only */
-static bfd_vma
-DEFUN (get_vma, (abfd, addr), bfd * abfd AND bfd_byte * addr)
-{
-  switch (sizeof (char*))
-    {
-    case 4:
-      return bfd_get_32 (abfd, addr);
-    case 8:
-      return bfd_get_64 (abfd, addr);
-    default:
-      fprintf (stderr, _("%s: bfd_vma has unexpected size of %ld bytes\n"),
-               whoami, (long) sizeof (char*));
-      done (1);
-    }
-}
-
-static void
-DEFUN (put_vma, (abfd, val, addr), bfd * abfd AND bfd_vma val AND bfd_byte * addr)
-{
-  switch (sizeof (char*))
-    {
-    case 4:
-      bfd_put_32 (abfd, val, addr);
+static int
+gmon_read_raw_arc (ifp, fpc, spc, cnt)
+     FILE *ifp;
+     bfd_vma *fpc;
+     bfd_vma *spc;
+     unsigned long *cnt;
+{
+#ifdef BFD_HOST_U_64_BIT
+  BFD_HOST_U_64_BIT cnt64;
+#endif
+  unsigned int cnt32;
+
+  if (gmon_io_read_vma (ifp, fpc)
+      || gmon_io_read_vma (ifp, spc))
+    return 1;
+
+  switch (gmon_get_ptr_size ())
+    {
+    case ptr_32bit:
+      if (gmon_io_read_32 (ifp, &cnt32))
+        return 1;
+      *cnt = cnt32;
       break;
-    case 8:
-      bfd_put_64 (abfd, val, addr);
+
+#ifdef BFD_HOST_U_64_BIT
+    case ptr_64bit:
+      if (gmon_io_read_64 (ifp, &cnt64))
+        return 1;
+      *cnt = cnt64;
       break;
-    default:
-      fprintf (stderr, _("%s: bfd_vma has unexpected size of %ld bytes\n"),
-               whoami, (long) sizeof (char*));
-      done (1);
-    }
+#endif
+    }
+  return 0;
+}
+
+static int
+gmon_write_raw_arc (ofp, fpc, spc, cnt)
+     FILE *ofp;
+     bfd_vma fpc;
+     bfd_vma spc;
+     unsigned long cnt;
+{
+
+  if (gmon_io_write_vma (ofp, fpc)
+      || gmon_io_write_vma (ofp, spc))
+    return 1;
+
+  switch (gmon_get_ptr_size ())
+    {
+    case ptr_32bit:
+      if (gmon_io_write_32 (ofp, (unsigned int) cnt))
+        return 1;
+      break;
+
+#ifdef BFD_HOST_U_64_BIT
+    case ptr_64bit:
+      if (gmon_io_write_64 (ofp, (BFD_HOST_U_64_BIT) cnt))
+        return 1;
+      break;
+#endif
+    }
+  return 0;
 }
 
 void
-DEFUN (gmon_out_read, (filename), const char *filename)
+gmon_out_read (filename)
+     const char *filename;
 {
   FILE *ifp;
@@ -273 +411 @@
         int ncnt;
       };
-      int i, samp_bytes, header_size;
+      int i, samp_bytes, header_size = 0;
       unsigned long count;
       bfd_vma from_pc, self_pc;
-      struct raw_arc raw_arc;
-      struct raw_phdr raw;
       static struct hdr h;
       UNIT raw_bin_count;
       struct hdr tmp;
+      int version;
 
       /* Information from a gmon.out file is in two parts: an array of
@@ -295 +432 @@
         }
 
-      if (fread (&raw, 1, sizeof (struct raw_phdr), ifp)
-          != sizeof (struct raw_phdr))
-        {
-          fprintf (stderr, _("%s: file too short to be a gmon file\n"),
+      /* The beginning of the old BSD header and the 4.4BSD header
+         are the same: lowpc, highpc, ncnt  */
+      if (gmon_io_read_vma (ifp, &tmp.low_pc)
+          || gmon_io_read_vma (ifp, &tmp.high_pc)
+          || gmon_io_read_32 (ifp, &tmp.ncnt))
+        {
+ bad_gmon_file:
+          fprintf (stderr, _("%s: file too short to be a gmon file\n"),
                    filename);
           done (1);
         }
 
-      tmp.low_pc = get_vma (core_bfd, (bfd_byte *) &raw.low_pc[0]);
-      tmp.high_pc = get_vma (core_bfd, (bfd_byte *) &raw.high_pc[0]);
-      tmp.ncnt = bfd_get_32 (core_bfd, (bfd_byte *) &raw.ncnt[0]);
-
-      if (bfd_get_32 (core_bfd, (bfd_byte *) &raw.version[0])
-          == GMONVERSION)
+      /* Check to see if this a 4.4BSD-style header.  */
+      if (gmon_io_read_32 (ifp, &version))
+        goto bad_gmon_file;
+
+      if (version == GMONVERSION)
         {
           int profrate;
 
           /* 4.4BSD format header.  */
-          profrate = bfd_get_32 (core_bfd, (bfd_byte *) &raw.profrate[0]);
+          if (gmon_io_read_32 (ifp, &profrate))
+            goto bad_gmon_file;
 
           if (!s_highpc)
@@ -325 +466 @@
             }
 
-          header_size = sizeof (struct raw_phdr);
+          switch (gmon_get_ptr_size ())
+            {
+            case ptr_32bit:
+              header_size = GMON_HDRSIZE_BSD44_32;
+              break;
+
+            case ptr_64bit:
+              header_size = GMON_HDRSIZE_BSD44_64;
+              break;
+            }
         }
       else
@@ -337 +487 @@
             }
 
-          if (fseek (ifp, sizeof (struct old_raw_phdr), SEEK_SET) < 0)
-            {
-              perror (filename);
-              done (1);
-            }
-
-          header_size = sizeof (struct old_raw_phdr);
+          switch (gmon_get_ptr_size ())
+            {
+            case ptr_32bit:
+              header_size = GMON_HDRSIZE_OLDBSD_32;
+              break;
+
+            case ptr_64bit:
+              header_size = GMON_HDRSIZE_OLDBSD_64;
+              break;
+            }
+        }
+
+      /* Position the file to after the header.  */
+      if (fseek (ifp, header_size, SEEK_SET) < 0)
+        {
+          perror (filename);
+          done (1);
         }
 
@@ -408 +568 @@
       /* The rest of the file consists of a bunch of
          <from,self,count> tuples.  */
-      while (fread (&raw_arc, sizeof (raw_arc), 1, ifp) == 1)
+      while (gmon_read_raw_arc (ifp, &from_pc, &self_pc, &count) == 0)
         {
           ++narcs;
-          from_pc = get_vma (core_bfd, (bfd_byte *) raw_arc.from_pc);
-          self_pc = get_vma (core_bfd, (bfd_byte *) raw_arc.self_pc);
-          count = bfd_get_32 (core_bfd, (bfd_byte *) raw_arc.count);
 
           DBG (SAMPLEDEBUG,
@@ -449 +606 @@
       printf (_("File `%s' (version %d) contains:\n"),
               filename, gmon_file_version);
-      printf (_("\t%d histogram record%s\n"),
-              nhist, nhist == 1 ? "" : "s");
-      printf (_("\t%d call-graph record%s\n"),
-              narcs, narcs == 1 ? "" : "s");
-      printf (_("\t%d basic-block count record%s\n"),
-              nbbs, nbbs == 1 ? "" : "s");
+      printf (nhist == 1 ?
+              _("\t%d histogram record\n") :
+              _("\t%d histogram records\n"), nhist);
+      printf (narcs == 1 ?
+              _("\t%d call-graph record\n") :
+              _("\t%d call-graph records\n"), narcs);
+      printf (nbbs == 1 ?
+              _("\t%d basic-block count record\n") :
+              _("\t%d basic-block count records\n"), nbbs);
       first_output = FALSE;
     }
@@ -461 +621 @@
 
 void
-DEFUN (gmon_out_write, (filename), const char *filename)
+gmon_out_write (filename)
+     const char *filename;
 {
   FILE *ofp;
@@ -478 +639 @@
 
       memcpy (&ghdr.cookie[0], GMON_MAGIC, 4);
-      bfd_put_32 (core_bfd, GMON_VERSION, (bfd_byte *) ghdr.version);
+      bfd_put_32 (core_bfd, (bfd_vma) GMON_VERSION, (bfd_byte *) ghdr.version);
 
       if (fwrite (&ghdr, sizeof (ghdr), 1, ofp) != 1)
@@ -500 +661 @@
   else if (file_format == FF_BSD || file_format == FF_BSD44)
     {
-      struct raw_arc raw_arc;
       UNIT raw_bin_count;
-      struct raw_phdr h;
-      int i;
+      int i, hdrsize;
+      unsigned padsize;
+      char pad[3*4];
       Arc *arc;
       Sym *sym;
 
-      memset (&h, 0, sizeof h);
-      put_vma (core_bfd, s_lowpc, (bfd_byte *) &h.low_pc);
-      put_vma (core_bfd, s_highpc, (bfd_byte *) &h.high_pc);
-      bfd_put_32 (core_bfd,
-                  hist_num_bins * sizeof (UNIT) + sizeof (struct raw_phdr),
-                  (bfd_byte *) &h.ncnt);
-
-      /* Write header.  Use new style BSD format is explicitly
-         specified, or if the profiling rate is non-standard;
-         otherwise, use the old BSD format.  */
+      memset (pad, 0, sizeof (pad));
+
+      hdrsize = 0;
+      /* Decide how large the header will be.  Use the 4.4BSD format
+         header if explicitly specified, or if the profiling rate is
+         non-standard.  Otherwise, use the old BSD format.  */
       if (file_format == FF_BSD44
-          || hz != hertz ())
-        {
-          bfd_put_32 (core_bfd, GMONVERSION, (bfd_byte *) &h.version);
-          bfd_put_32 (core_bfd, hz, (bfd_byte *) &h.profrate);
-          if (fwrite (&h, sizeof (struct raw_phdr), 1, ofp) != 1)
+          || hz != hertz())
+        {
+          padsize = 3*4;
+          switch (gmon_get_ptr_size ())
+            {
+            case ptr_32bit:
+              hdrsize = GMON_HDRSIZE_BSD44_32;
+              break;
+
+            case ptr_64bit:
+              hdrsize = GMON_HDRSIZE_BSD44_64;
+              break;
+            }
+        }
+      else
+        {
+          padsize = 0;
+          switch (gmon_get_ptr_size ())
+            {
+            case ptr_32bit:
+              hdrsize = GMON_HDRSIZE_OLDBSD_32;
+              break;
+
+            case ptr_64bit:
+              hdrsize = GMON_HDRSIZE_OLDBSD_64;
+              /* FIXME: Checking host compiler defines here means that we can't
+                 use a cross gprof alpha OSF.  */ 
+#if defined(__alpha__) && defined (__osf__)
+              padsize = 4;
+#endif
+              break;
+            }
+        }
+
+      /* Write the parts of the headers that are common to both the
+         old BSD and 4.4BSD formats.  */
+      if (gmon_io_write_vma (ofp, s_lowpc)
+          || gmon_io_write_vma (ofp, s_highpc)
+          || gmon_io_write_32 (ofp, hist_num_bins * sizeof (UNIT) + hdrsize))
+        {
+          perror (filename);
+          done (1);
+        }
+
+      /* Write out the 4.4BSD header bits, if that's what we're using.  */
+      if (file_format == FF_BSD44
+          || hz != hertz())
+        {
+          if (gmon_io_write_32 (ofp, GMONVERSION)
+              || gmon_io_write_32 (ofp, (unsigned int) hz))
             {
               perror (filename);
@@ -528 +730 @@
             }
         }
-      else
-        {
-          if (fwrite (&h, sizeof (struct old_raw_phdr), 1, ofp) != 1)
+
+      /* Now write out any necessary padding after the meaningful
+         header bits.  */
+      if (padsize != 0
+          && fwrite (pad, 1, padsize, ofp) != padsize)
+        {
+          perror (filename);
+          done (1);
+        }
+
+      /* Dump the samples.  */
+      for (i = 0; i < hist_num_bins; ++i)
+        {
+          bfd_put_16 (core_bfd, (bfd_vma) hist_sample[i],
+                      (bfd_byte *) &raw_bin_count[0]);
+          if (fwrite (&raw_bin_count[0], sizeof (raw_bin_count), 1, ofp) != 1)
             {
               perror (filename);
@@ -537 +752 @@
         }
 
-      /* Dump the samples.  */
-      for (i = 0; i < hist_num_bins; ++i)
-        {
-          bfd_put_16 (core_bfd, hist_sample[i], (bfd_byte *) & raw_bin_count[0]);
-          if (fwrite (&raw_bin_count[0], sizeof (raw_bin_count), 1, ofp) != 1)
-            {
-              perror (filename);
-              done (1);
-            }
-        }
-
       /* Dump the normalized raw arc information.  */
       for (sym = symtab.base; sym < symtab.limit; ++sym)
@@ -553 +757 @@
           for (arc = sym->cg.children; arc; arc = arc->next_child)
             {
-              put_vma (core_bfd, arc->parent->addr,
-                       (bfd_byte *) raw_arc.from_pc);
-              put_vma (core_bfd, arc->child->addr,
-                       (bfd_byte *) raw_arc.self_pc);
-              bfd_put_32 (core_bfd, arc->count, (bfd_byte *) raw_arc.count);
-              if (fwrite (&raw_arc, sizeof (raw_arc), 1, ofp) != 1)
+              if (gmon_write_raw_arc (ofp, arc->parent->addr,
+                                      arc->child->addr, arc->count))
                 {
                   perror (filename);

branches/GNU/src/binutils/gprof/gmon_io.h

@@ -1 +1 @@
 /* gmon_io.h
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Binutils.
@@ -22 +22 @@
 #ifndef gmon_io_h
 #define gmon_io_h
-
-#include "bfd.h"
-#include "gmon.h"
 
 /* Some platforms need to put stdin into binary mode, to read
@@ -56 +53 @@
 extern int gmon_io_write_vma PARAMS ((FILE *ifp, bfd_vma val));
 extern int gmon_io_write_32 PARAMS ((FILE *ifp, unsigned int val));
-extern int gmon_io_write_8 PARAMS ((FILE *ifp, unsigned char val));
+extern int gmon_io_write_8 PARAMS ((FILE *ifp, unsigned int val));
 extern int gmon_io_write PARAMS ((FILE *ifp, char *buf, size_t n));
 

branches/GNU/src/binutils/gprof/gmon_out.h

@@ -26 +26 @@
 #define gmon_out_h
 
-#include <gconfig.h>
-
 #define GMON_MAGIC      "gmon"  /* magic cookie */
 #define GMON_VERSION    1       /* version number */

branches/GNU/src/binutils/gprof/gprof.1

@@ -1 @@
-.\" Copyright (c) 1983, 1990 The Regents of the University of California.
-.\" All rights reserved.
+.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13
 .\"
-.\" Redistribution and use in source and binary forms are permitted provided
-.\" that: (1) source distributions retain this entire copyright notice and
-.\" comment, and (2) distributions including binaries display the following
-.\" acknowledgement:  ``This product includes software developed by the
-.\" University of California, Berkeley and its contributors'' in the
-.\" documentation or other materials provided with the distribution and in
-.\" all advertising materials mentioning features or use of this software.
-.\" Neither the name of the University nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software without
-.\" specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
 .\"
-.\"     @(#)gprof.1     6.6 (Berkeley) 7/24/90
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
 .\"
-.TH GPROF 1 "January 29, 1993"
-.SH NAME
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "GPROF 1"
+.TH GPROF 1 "2003-04-27" "binutils-2.13.90" "GNU"
+.SH "NAME"
 gprof \- display call graph profile data
-.SH SYNOPSIS
-.B gprof [ \-abcsz ] [ \-e|\-E
-.I name
-.B ] [ \-f|\-F 
-.I name
-.B ] 
-.B [ \-k
-.I fromname toname
-.B ] [ 
-.I objfile
-.B [ 
-.I gmon.out
-.B ] 
-.B ] 
-.SH DESCRIPTION
-.B gprof
-produces an execution profile of C, Pascal, or Fortran77 programs.
-The effect of called routines is incorporated in the profile of each caller.
-The profile data is taken from the call graph profile file
-\&(`gmon.out' default) which is created by programs
-that are compiled with the
-.B \-pg
-option of
-.BR cc ( 1 ) ,
-.BR pc ( 1 ) ,
-and
-.BR f77 ( 1 ) .
-The
-.B \-pg
-option also links in versions of the library routines
-that are compiled for profiling.
-.B Gprof
-reads the given object file (the default is `a.out')
-and establishes the relation between its symbol table
-and the call graph profile from `gmon.out'.
-If more than one profile file is specified,
-the
-.B gprof
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+gprof [ \-[abcDhilLsTvwxyz] ] [ \-[ACeEfFJnNOpPqQZ][\fIname\fR] ] 
+ [ \-I \fIdirs\fR ] [ \-d[\fInum\fR] ] [ \-k \fIfrom/to\fR ]
+ [ \-m \fImin-count\fR ] [ \-t \fItable-length\fR ]
+ [ \-\-[no\-]annotated\-source[=\fIname\fR] ] 
+ [ \-\-[no\-]exec\-counts[=\fIname\fR] ]
+ [ \-\-[no\-]flat\-profile[=\fIname\fR] ] [ \-\-[no\-]graph[=\fIname\fR] ]
+ [ \-\-[no\-]time=\fIname\fR] [ \-\-all\-lines ] [ \-\-brief ] 
+ [ \-\-debug[=\fIlevel\fR] ] [ \-\-function\-ordering ] 
+ [ \-\-file\-ordering ] [ \-\-directory\-path=\fIdirs\fR ]
+ [ \-\-display\-unused\-functions ] [ \-\-file\-format=\fIname\fR ]
+ [ \-\-file\-info ] [ \-\-help ] [ \-\-line ] [ \-\-min\-count=\fIn\fR ]
+ [ \-\-no\-static ] [ \-\-print\-path ] [ \-\-separate\-files ]
+ [ \-\-static\-call\-graph ] [ \-\-sum ] [ \-\-table\-length=\fIlen\fR ]
+ [ \-\-traditional ] [ \-\-version ] [ \-\-width=\fIn\fR ]
+ [ \-\-ignore\-non\-functions ] [ \-\-demangle[=\fI\s-1STYLE\s0\fR] ]
+ [ \-\-no\-demangle ] [ \fIimage-file\fR ] [ \fIprofile-file\fR ... ]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\f(CW\*(C`gprof\*(C'\fR produces an execution profile of C, Pascal, or Fortran77 
+programs.  The effect of called routines is incorporated in the profile 
+of each caller.  The profile data is taken from the call graph profile file
+(\fIgmon.out\fR default) which is created by programs
+that are compiled with the \fB\-pg\fR option of
+\&\f(CW\*(C`cc\*(C'\fR, \f(CW\*(C`pc\*(C'\fR, and \f(CW\*(C`f77\*(C'\fR.
+The \fB\-pg\fR option also links in versions of the library routines
+that are compiled for profiling.  \f(CW\*(C`Gprof\*(C'\fR reads the given object 
+file (the default is \f(CW\*(C`a.out\*(C'\fR) and establishes the relation between
+its symbol table and the call graph profile from \fIgmon.out\fR.
+If more than one profile file is specified, the \f(CW\*(C`gprof\*(C'\fR
 output shows the sum of the profile information in the given profile files.
 .PP
-.B Gprof
-calculates the amount of time spent in each routine.
+\&\f(CW\*(C`Gprof\*(C'\fR calculates the amount of time spent in each routine.
 Next, these times are propagated along the edges of the call graph.
 Cycles are discovered, and calls into a cycle are made to share the time
 of the cycle.
-The first listing shows the functions
-sorted according to the time they represent
-including the time of their call graph descendants.
-Below each function entry is shown its (direct) call graph children,
-and how their times are propagated to this function.
-A similar display above the function shows how this function's time and the
-time of its descendants is propagated to its (direct) call graph parents.
-.PP
-Cycles are also shown, with an entry for the cycle as a whole and
-a listing of the members of the cycle and their contributions to the
-time and call counts of the cycle.
-.PP
-Second, a flat profile is given,
-similar to that provided by
-.BR prof ( 1 )  .
-This listing gives the total execution times, the call counts,
-the time in milliseconds the call spent in the routine itself, and
-the time in milliseconds the call spent in the routine itself including
-its descendants.
-.PP
-Finally, an index of the function names is provided.
-.SH OPTIONS
-The following options are available:
-.TP
-.B \-a
-suppresses the printing of statically declared functions.
-If this option is given, all relevant information about the static function
-(e.g., time samples, calls to other functions, calls from other functions)
-belongs to the function loaded just before the static function in the
-\&`objfile' file.
-.TP
-.B \-b
-suppresses the printing of a description of each field in the profile.
-.TP
-.B \-c
-the static call graph of the program is discovered by a heuristic
-that examines the text space of the object file.
-Static-only parents or children are shown
-with call counts of 0.
-.TP
-.BI "\-e " name
-suppresses the printing of the graph profile entry for routine
-.I name
-and all its descendants
-(unless they have other ancestors that aren't suppressed).
-More than one
-.B \-e
-option may be given.
-Only one
-.I name
-may be given with each
-.B \-e
-option.
-.TP
-.BI "\-E " name
-suppresses the printing of the graph profile entry for routine
-.I name
-(and its descendants) as
-.B \-e  ,
-above, and also excludes the time spent in
-.I name
-(and its descendants) from the total and percentage time computations.
-(For example,
-.BI "\-E " mcount
-.BI "\-E " mcleanup
-is the default.)
-.TP
-.BI "\-f " name
-prints the graph profile entry of only the specified routine
-.I name
-and its descendants.
-More than one
-.B \-f
-option may be given.
-Only one
-.I name
-may be given with each
-.B \-f
-option.
-.TP
-.BI "\-F " name
-prints the graph profile entry of only the routine
-.I name
-and its descendants (as
-.B \-f ,
-above) and also uses only the times of the printed routines
-in total time and percentage computations.
-More than one
-.B \-F
-option may be given.
-Only one
-.I name
-may be given with each
-.B \-F
-option.
-The
-.B \-F
-option
-overrides
-the
-.B \-E
-option.
-.TP
-.BI "\-k " "fromname toname"
-will delete any arcs from routine
-.I fromname
-to routine
-.IR toname  .
-This can be used to break undesired cycles.
-More than one
-.B \-k
-option may be given.
-Only one pair of routine names may be given with each
-.B \-k
-option.
-.TP
-.B \-s
-a profile file `gmon.sum' is produced that represents
-the sum of the profile information in all the specified profile files.
-This summary profile file may be given to later
-executions of gprof (probably also with a
-.BR \-s  )
-to accumulate profile data across several runs of an `objfile' file.
-.TP
-.B -v
-prints the version number for gprof, and then exits.
-.TP
-.B -z
-displays routines that have zero usage (as shown by call counts
-and accumulated time).
-This is useful with the
-.B \-c
-option for discovering which routines were never called.
-.PP
-.SH FILES
-.ta \w'gmon.sum 'u
-a.out   the namelist and text space.
-.br
-gmon.out        dynamic call graph and profile.
-.br
-gmon.sum summarized dynamic call graph and profile.
-.SH SEE ALSO
-.BR monitor ( 3 ) ,
-.BR profil ( 2 ) ,
-.BR cc ( 1 ) ,
-.BR prof ( 1 )
-.sp
-``An Execution Profiler for Modular Programs'',
-by S. Graham, P. Kessler, M. McKusick;
-.I
-Software \- Practice and Experience,
-Vol. 13, pp. 671-685, 1983.
-.sp
-``gprof: A Call Graph Execution Profiler'',
-by S. Graham, P. Kessler, M. McKusick;
-.I
-Proceedings of the SIGPLAN '82 Symposium on Compiler Construction,
-SIGPLAN Notices, Vol. 17, No  6, pp. 120-126, June 1982.
-.SH HISTORY
-.B Gprof
-appeared in 4.2 BSD.
-.SH BUGS
+.PP
+Several forms of output are available from the analysis.
+.PP
+The \fIflat profile\fR shows how much time your program spent in each function,
+and how many times that function was called.  If you simply want to know
+which functions burn most of the cycles, it is stated concisely here.
+.PP
+The \fIcall graph\fR shows, for each function, which functions called it, which
+other functions it called, and how many times.  There is also an estimate
+of how much time was spent in the subroutines of each function.  This can
+suggest places where you might try to eliminate function calls that use a
+lot of time.  
+.PP
+The \fIannotated source\fR listing is a copy of the program's
+source code, labeled with the number of times each line of the
+program was executed.  
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+These options specify which of several output formats
+\&\f(CW\*(C`gprof\*(C'\fR should produce.
+.PP
+Many of these options take an optional \fIsymspec\fR to specify
+functions to be included or excluded.  These options can be
+specified multiple times, with different symspecs, to include
+or exclude sets of symbols.  
+.PP
+Specifying any of these options overrides the default (\fB\-p \-q\fR),
+which prints a flat profile and call graph analysis
+for all functions.
+.ie n .IP """\-A[\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-A[\f(CIsymspec\f(CW]\fR" 4
+.IX Item "-A[symspec]"
+.PD 0
+.ie n .IP """\-\-annotated\-source[=\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-\-annotated\-source[=\f(CIsymspec\f(CW]\fR" 4
+.IX Item "--annotated-source[=symspec]"
+.PD
+The \fB\-A\fR option causes \f(CW\*(C`gprof\*(C'\fR to print annotated source code.
+If \fIsymspec\fR is specified, print output only for matching symbols.
+.ie n .IP """\-b""" 4
+.el .IP "\f(CW\-b\fR" 4
+.IX Item "-b"
+.PD 0
+.ie n .IP """\-\-brief""" 4
+.el .IP "\f(CW\-\-brief\fR" 4
+.IX Item "--brief"
+.PD
+If the \fB\-b\fR option is given, \f(CW\*(C`gprof\*(C'\fR doesn't print the
+verbose blurbs that try to explain the meaning of all of the fields in
+the tables.  This is useful if you intend to print out the output, or
+are tired of seeing the blurbs.
+.ie n .IP """\-C[\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-C[\f(CIsymspec\f(CW]\fR" 4
+.IX Item "-C[symspec]"
+.PD 0
+.ie n .IP """\-\-exec\-counts[=\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-\-exec\-counts[=\f(CIsymspec\f(CW]\fR" 4
+.IX Item "--exec-counts[=symspec]"
+.PD
+The \fB\-C\fR option causes \f(CW\*(C`gprof\*(C'\fR to
+print a tally of functions and the number of times each was called.
+If \fIsymspec\fR is specified, print tally only for matching symbols.
+.Sp
+If the profile data file contains basic-block count records, specifying
+the \fB\-l\fR option, along with \fB\-C\fR, will cause basic-block
+execution counts to be tallied and displayed.
+.ie n .IP """\-i""" 4
+.el .IP "\f(CW\-i\fR" 4
+.IX Item "-i"
+.PD 0
+.ie n .IP """\-\-file\-info""" 4
+.el .IP "\f(CW\-\-file\-info\fR" 4
+.IX Item "--file-info"
+.PD
+The \fB\-i\fR option causes \f(CW\*(C`gprof\*(C'\fR to display summary information
+about the profile data file(s) and then exit.  The number of histogram,
+call graph, and basic-block count records is displayed.
+.ie n .IP """\-I \f(CIdirs\f(CW""" 4
+.el .IP "\f(CW\-I \f(CIdirs\f(CW\fR" 4
+.IX Item "-I dirs"
+.PD 0
+.ie n .IP """\-\-directory\-path=\f(CIdirs\f(CW""" 4
+.el .IP "\f(CW\-\-directory\-path=\f(CIdirs\f(CW\fR" 4
+.IX Item "--directory-path=dirs"
+.PD
+The \fB\-I\fR option specifies a list of search directories in
+which to find source files.  Environment variable \fI\s-1GPROF_PATH\s0\fR
+can also be used to convey this information.
+Used mostly for annotated source output.
+.ie n .IP """\-J[\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-J[\f(CIsymspec\f(CW]\fR" 4
+.IX Item "-J[symspec]"
+.PD 0
+.ie n .IP """\-\-no\-annotated\-source[=\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-\-no\-annotated\-source[=\f(CIsymspec\f(CW]\fR" 4
+.IX Item "--no-annotated-source[=symspec]"
+.PD
+The \fB\-J\fR option causes \f(CW\*(C`gprof\*(C'\fR not to
+print annotated source code.
+If \fIsymspec\fR is specified, \f(CW\*(C`gprof\*(C'\fR prints annotated source,
+but excludes matching symbols.
+.ie n .IP """\-L""" 4
+.el .IP "\f(CW\-L\fR" 4
+.IX Item "-L"
+.PD 0
+.ie n .IP """\-\-print\-path""" 4
+.el .IP "\f(CW\-\-print\-path\fR" 4
+.IX Item "--print-path"
+.PD
+Normally, source filenames are printed with the path
+component suppressed.  The \fB\-L\fR option causes \f(CW\*(C`gprof\*(C'\fR
+to print the full pathname of
+source filenames, which is determined
+from symbolic debugging information in the image file
+and is relative to the directory in which the compiler
+was invoked.
+.ie n .IP """\-p[\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-p[\f(CIsymspec\f(CW]\fR" 4
+.IX Item "-p[symspec]"
+.PD 0
+.ie n .IP """\-\-flat\-profile[=\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-\-flat\-profile[=\f(CIsymspec\f(CW]\fR" 4
+.IX Item "--flat-profile[=symspec]"
+.PD
+The \fB\-p\fR option causes \f(CW\*(C`gprof\*(C'\fR to print a flat profile.
+If \fIsymspec\fR is specified, print flat profile only for matching symbols.
+.ie n .IP """\-P[\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-P[\f(CIsymspec\f(CW]\fR" 4
+.IX Item "-P[symspec]"
+.PD 0
+.ie n .IP """\-\-no\-flat\-profile[=\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-\-no\-flat\-profile[=\f(CIsymspec\f(CW]\fR" 4
+.IX Item "--no-flat-profile[=symspec]"
+.PD
+The \fB\-P\fR option causes \f(CW\*(C`gprof\*(C'\fR to suppress printing a flat profile.
+If \fIsymspec\fR is specified, \f(CW\*(C`gprof\*(C'\fR prints a flat profile,
+but excludes matching symbols.
+.ie n .IP """\-q[\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-q[\f(CIsymspec\f(CW]\fR" 4
+.IX Item "-q[symspec]"
+.PD 0
+.ie n .IP """\-\-graph[=\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-\-graph[=\f(CIsymspec\f(CW]\fR" 4
+.IX Item "--graph[=symspec]"
+.PD
+The \fB\-q\fR option causes \f(CW\*(C`gprof\*(C'\fR to print the call graph analysis.
+If \fIsymspec\fR is specified, print call graph only for matching symbols
+and their children.
+.ie n .IP """\-Q[\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-Q[\f(CIsymspec\f(CW]\fR" 4
+.IX Item "-Q[symspec]"
+.PD 0
+.ie n .IP """\-\-no\-graph[=\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-\-no\-graph[=\f(CIsymspec\f(CW]\fR" 4
+.IX Item "--no-graph[=symspec]"
+.PD
+The \fB\-Q\fR option causes \f(CW\*(C`gprof\*(C'\fR to suppress printing the
+call graph.
+If \fIsymspec\fR is specified, \f(CW\*(C`gprof\*(C'\fR prints a call graph,
+but excludes matching symbols.
+.ie n .IP """\-y""" 4
+.el .IP "\f(CW\-y\fR" 4
+.IX Item "-y"
+.PD 0
+.ie n .IP """\-\-separate\-files""" 4
+.el .IP "\f(CW\-\-separate\-files\fR" 4
+.IX Item "--separate-files"
+.PD
+This option affects annotated source output only.
+Normally, \f(CW\*(C`gprof\*(C'\fR prints annotated source files
+to standard\-output.  If this option is specified,
+annotated source for a file named \fIpath/\fIfilename\fI\fR
+is generated in the file \fI\fIfilename\fI\-ann\fR.  If the underlying
+filesystem would truncate \fI\fIfilename\fI\-ann\fR so that it
+overwrites the original \fI\fIfilename\fI\fR, \f(CW\*(C`gprof\*(C'\fR generates
+annotated source in the file \fI\fIfilename\fI.ann\fR instead (if the
+original file name has an extension, that extension is \fIreplaced\fR
+with \fI.ann\fR).
+.ie n .IP """\-Z[\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-Z[\f(CIsymspec\f(CW]\fR" 4
+.IX Item "-Z[symspec]"
+.PD 0
+.ie n .IP """\-\-no\-exec\-counts[=\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-\-no\-exec\-counts[=\f(CIsymspec\f(CW]\fR" 4
+.IX Item "--no-exec-counts[=symspec]"
+.PD
+The \fB\-Z\fR option causes \f(CW\*(C`gprof\*(C'\fR not to
+print a tally of functions and the number of times each was called.
+If \fIsymspec\fR is specified, print tally, but exclude matching symbols.
+.ie n .IP """\-\-function\-ordering""" 4
+.el .IP "\f(CW\-\-function\-ordering\fR" 4
+.IX Item "--function-ordering"
+The \fB\-\-function\-ordering\fR option causes \f(CW\*(C`gprof\*(C'\fR to print a
+suggested function ordering for the program based on profiling data.
+This option suggests an ordering which may improve paging, tlb and
+cache behavior for the program on systems which support arbitrary
+ordering of functions in an executable.
+.Sp
+The exact details of how to force the linker to place functions
+in a particular order is system dependent and out of the scope of this
+manual.
+.ie n .IP """\-\-file\-ordering \f(CImap_file\f(CW""" 4
+.el .IP "\f(CW\-\-file\-ordering \f(CImap_file\f(CW\fR" 4
+.IX Item "--file-ordering map_file"
+The \fB\-\-file\-ordering\fR option causes \f(CW\*(C`gprof\*(C'\fR to print a
+suggested .o link line ordering for the program based on profiling data.
+This option suggests an ordering which may improve paging, tlb and
+cache behavior for the program on systems which do not support arbitrary
+ordering of functions in an executable.
+.Sp
+Use of the \fB\-a\fR argument is highly recommended with this option.
+.Sp
+The \fImap_file\fR argument is a pathname to a file which provides
+function name to object file mappings.  The format of the file is similar to
+the output of the program \f(CW\*(C`nm\*(C'\fR.
+.Sp
+.Vb 8
+\&        c-parse.o:00000000 T yyparse
+\&        c-parse.o:00000004 C yyerrflag
+\&        c-lang.o:00000000 T maybe_objc_method_name
+\&        c-lang.o:00000000 T print_lang_statistics
+\&        c-lang.o:00000000 T recognize_objc_keyword
+\&        c-decl.o:00000000 T print_lang_identifier
+\&        c-decl.o:00000000 T print_lang_type
+\&        ...
+.Ve
+.Sp
+To create a \fImap_file\fR with \s-1GNU\s0 \f(CW\*(C`nm\*(C'\fR, type a command like
+\&\f(CW\*(C`nm \-\-extern\-only \-\-defined\-only \-v \-\-print\-file\-name program\-name\*(C'\fR.
+.ie n .IP """\-T""" 4
+.el .IP "\f(CW\-T\fR" 4
+.IX Item "-T"
+.PD 0
+.ie n .IP """\-\-traditional""" 4
+.el .IP "\f(CW\-\-traditional\fR" 4
+.IX Item "--traditional"
+.PD
+The \fB\-T\fR option causes \f(CW\*(C`gprof\*(C'\fR to print its output in
+``traditional'' \s-1BSD\s0 style.
+.ie n .IP """\-w \f(CIwidth\f(CW""" 4
+.el .IP "\f(CW\-w \f(CIwidth\f(CW\fR" 4
+.IX Item "-w width"
+.PD 0
+.ie n .IP """\-\-width=\f(CIwidth\f(CW""" 4
+.el .IP "\f(CW\-\-width=\f(CIwidth\f(CW\fR" 4
+.IX Item "--width=width"
+.PD
+Sets width of output lines to \fIwidth\fR.
+Currently only used when printing the function index at the bottom
+of the call graph.
+.ie n .IP """\-x""" 4
+.el .IP "\f(CW\-x\fR" 4
+.IX Item "-x"
+.PD 0
+.ie n .IP """\-\-all\-lines""" 4
+.el .IP "\f(CW\-\-all\-lines\fR" 4
+.IX Item "--all-lines"
+.PD
+This option affects annotated source output only.
+By default, only the lines at the beginning of a basic-block
+are annotated.  If this option is specified, every line in
+a basic-block is annotated by repeating the annotation for the
+first line.  This behavior is similar to \f(CW\*(C`tcov\*(C'\fR's \fB\-a\fR.
+.ie n .IP """\-\-demangle[=\f(CIstyle\f(CW]""" 4
+.el .IP "\f(CW\-\-demangle[=\f(CIstyle\f(CW]\fR" 4
+.IX Item "--demangle[=style]"
+.PD 0
+.ie n .IP """\-\-no\-demangle""" 4
+.el .IP "\f(CW\-\-no\-demangle\fR" 4
+.IX Item "--no-demangle"
+.PD
+These options control whether \*(C+ symbol names should be demangled when
+printing output.  The default is to demangle symbols.  The
+\&\f(CW\*(C`\-\-no\-demangle\*(C'\fR option may be used to turn off demangling. Different 
+compilers have different mangling styles.  The optional demangling style 
+argument can be used to choose an appropriate demangling style for your 
+compiler.
+.Sh "Analysis Options"
+.IX Subsection "Analysis Options"
+.ie n .IP """\-a""" 4
+.el .IP "\f(CW\-a\fR" 4
+.IX Item "-a"
+.PD 0
+.ie n .IP """\-\-no\-static""" 4
+.el .IP "\f(CW\-\-no\-static\fR" 4
+.IX Item "--no-static"
+.PD
+The \fB\-a\fR option causes \f(CW\*(C`gprof\*(C'\fR to suppress the printing of
+statically declared (private) functions.  (These are functions whose
+names are not listed as global, and which are not visible outside the
+file/function/block where they were defined.)  Time spent in these
+functions, calls to/from them, etc, will all be attributed to the
+function that was loaded directly before it in the executable file.
+This option affects both the flat profile and the call graph.
+.ie n .IP """\-c""" 4
+.el .IP "\f(CW\-c\fR" 4
+.IX Item "-c"
+.PD 0
+.ie n .IP """\-\-static\-call\-graph""" 4
+.el .IP "\f(CW\-\-static\-call\-graph\fR" 4
+.IX Item "--static-call-graph"
+.PD
+The \fB\-c\fR option causes the call graph of the program to be
+augmented by a heuristic which examines the text space of the object
+file and identifies function calls in the binary machine code.
+Since normal call graph records are only generated when functions are
+entered, this option identifies children that could have been called,
+but never were.  Calls to functions that were not compiled with
+profiling enabled are also identified, but only if symbol table
+entries are present for them.
+Calls to dynamic library routines are typically \fInot\fR found
+by this option.
+Parents or children identified via this heuristic
+are indicated in the call graph with call counts of \fB0\fR.
+.ie n .IP """\-D""" 4
+.el .IP "\f(CW\-D\fR" 4
+.IX Item "-D"
+.PD 0
+.ie n .IP """\-\-ignore\-non\-functions""" 4
+.el .IP "\f(CW\-\-ignore\-non\-functions\fR" 4
+.IX Item "--ignore-non-functions"
+.PD
+The \fB\-D\fR option causes \f(CW\*(C`gprof\*(C'\fR to ignore symbols which
+are not known to be functions.  This option will give more accurate
+profile data on systems where it is supported (Solaris and \s-1HPUX\s0 for
+example).
+.ie n .IP """\-k \f(CIfrom\f(CW/\f(CIto\f(CW""" 4
+.el .IP "\f(CW\-k \f(CIfrom\f(CW/\f(CIto\f(CW\fR" 4
+.IX Item "-k from/to"
+The \fB\-k\fR option allows you to delete from the call graph any arcs from
+symbols matching symspec \fIfrom\fR to those matching symspec \fIto\fR.
+.ie n .IP """\-l""" 4
+.el .IP "\f(CW\-l\fR" 4
+.IX Item "-l"
+.PD 0
+.ie n .IP """\-\-line""" 4
+.el .IP "\f(CW\-\-line\fR" 4
+.IX Item "--line"
+.PD
+The \fB\-l\fR option enables line-by-line profiling, which causes
+histogram hits to be charged to individual source code lines,
+instead of functions.
+If the program was compiled with basic-block counting enabled,
+this option will also identify how many times each line of
+code was executed.
+While line-by-line profiling can help isolate where in a large function
+a program is spending its time, it also significantly increases
+the running time of \f(CW\*(C`gprof\*(C'\fR, and magnifies statistical
+inaccuracies.
+.ie n .IP """\-m \f(CInum\f(CW""" 4
+.el .IP "\f(CW\-m \f(CInum\f(CW\fR" 4
+.IX Item "-m num"
+.PD 0
+.ie n .IP """\-\-min\-count=\f(CInum\f(CW""" 4
+.el .IP "\f(CW\-\-min\-count=\f(CInum\f(CW\fR" 4
+.IX Item "--min-count=num"
+.PD
+This option affects execution count output only.
+Symbols that are executed less than \fInum\fR times are suppressed.
+.ie n .IP """\-n[\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-n[\f(CIsymspec\f(CW]\fR" 4
+.IX Item "-n[symspec]"
+.PD 0
+.ie n .IP """\-\-time[=\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-\-time[=\f(CIsymspec\f(CW]\fR" 4
+.IX Item "--time[=symspec]"
+.PD
+The \fB\-n\fR option causes \f(CW\*(C`gprof\*(C'\fR, in its call graph analysis,
+to only propagate times for symbols matching \fIsymspec\fR.
+.ie n .IP """\-N[\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-N[\f(CIsymspec\f(CW]\fR" 4
+.IX Item "-N[symspec]"
+.PD 0
+.ie n .IP """\-\-no\-time[=\f(CIsymspec\f(CW]""" 4
+.el .IP "\f(CW\-\-no\-time[=\f(CIsymspec\f(CW]\fR" 4
+.IX Item "--no-time[=symspec]"
+.PD
+The \fB\-n\fR option causes \f(CW\*(C`gprof\*(C'\fR, in its call graph analysis,
+not to propagate times for symbols matching \fIsymspec\fR.
+.ie n .IP """\-z""" 4
+.el .IP "\f(CW\-z\fR" 4
+.IX Item "-z"
+.PD 0
+.ie n .IP """\-\-display\-unused\-functions""" 4
+.el .IP "\f(CW\-\-display\-unused\-functions\fR" 4
+.IX Item "--display-unused-functions"
+.PD
+If you give the \fB\-z\fR option, \f(CW\*(C`gprof\*(C'\fR will mention all
+functions in the flat profile, even those that were never called, and
+that had no time spent in them.  This is useful in conjunction with the
+\&\fB\-c\fR option for discovering which routines were never called.
+.Sh "Miscellaneous Options"
+.IX Subsection "Miscellaneous Options"
+.ie n .IP """\-d[\f(CInum\f(CW]""" 4
+.el .IP "\f(CW\-d[\f(CInum\f(CW]\fR" 4
+.IX Item "-d[num]"
+.PD 0
+.ie n .IP """\-\-debug[=\f(CInum\f(CW]""" 4
+.el .IP "\f(CW\-\-debug[=\f(CInum\f(CW]\fR" 4
+.IX Item "--debug[=num]"
+.PD
+The \fB\-d\fR \fInum\fR option specifies debugging options.
+If \fInum\fR is not specified, enable all debugging.
+.ie n .IP """\-O\f(CIname\f(CW""" 4
+.el .IP "\f(CW\-O\f(CIname\f(CW\fR" 4
+.IX Item "-Oname"
+.PD 0
+.ie n .IP """\-\-file\-format=\f(CIname\f(CW""" 4
+.el .IP "\f(CW\-\-file\-format=\f(CIname\f(CW\fR" 4
+.IX Item "--file-format=name"
+.PD
+Selects the format of the profile data files.  Recognized formats are
+\&\fBauto\fR (the default), \fBbsd\fR, \fB4.4bsd\fR, \fBmagic\fR, and
+\&\fBprof\fR (not yet supported).
+.ie n .IP """\-s""" 4
+.el .IP "\f(CW\-s\fR" 4
+.IX Item "-s"
+.PD 0
+.ie n .IP """\-\-sum""" 4
+.el .IP "\f(CW\-\-sum\fR" 4
+.IX Item "--sum"
+.PD
+The \fB\-s\fR option causes \f(CW\*(C`gprof\*(C'\fR to summarize the information
+in the profile data files it read in, and write out a profile data
+file called \fIgmon.sum\fR, which contains all the information from
+the profile data files that \f(CW\*(C`gprof\*(C'\fR read in.  The file \fIgmon.sum\fR
+may be one of the specified input files; the effect of this is to
+merge the data in the other input files into \fIgmon.sum\fR.
+.Sp
+Eventually you can run \f(CW\*(C`gprof\*(C'\fR again without \fB\-s\fR to analyze the
+cumulative data in the file \fIgmon.sum\fR.
+.ie n .IP """\-v""" 4
+.el .IP "\f(CW\-v\fR" 4
+.IX Item "-v"
+.PD 0
+.ie n .IP """\-\-version""" 4
+.el .IP "\f(CW\-\-version\fR" 4
+.IX Item "--version"
+.PD
+The \fB\-v\fR flag causes \f(CW\*(C`gprof\*(C'\fR to print the current version
+number, and then exit.
+.Sh "Deprecated Options"
+.IX Subsection "Deprecated Options"
+.RS 4
+These options have been replaced with newer versions that use symspecs.
+.RE
+.ie n .IP """\-e \f(CIfunction_name\f(CW""" 4
+.el .IP "\f(CW\-e \f(CIfunction_name\f(CW\fR" 4
+.IX Item "-e function_name"
+The \fB\-e\fR \fIfunction\fR option tells \f(CW\*(C`gprof\*(C'\fR to not print
+information about the function \fIfunction_name\fR (and its
+children...) in the call graph.  The function will still be listed
+as a child of any functions that call it, but its index number will be
+shown as \fB[not printed]\fR.  More than one \fB\-e\fR option may be
+given; only one \fIfunction_name\fR may be indicated with each \fB\-e\fR
+option. 
+.ie n .IP """\-E \f(CIfunction_name\f(CW""" 4
+.el .IP "\f(CW\-E \f(CIfunction_name\f(CW\fR" 4
+.IX Item "-E function_name"
+The \f(CW\*(C`\-E \f(CIfunction\f(CW\*(C'\fR option works like the \f(CW\*(C`\-e\*(C'\fR option, but
+time spent in the function (and children who were not called from
+anywhere else), will not be used to compute the percentages-of-time for
+the call graph.  More than one \fB\-E\fR option may be given; only one
+\&\fIfunction_name\fR may be indicated with each \fB\-E\fR option.
+.ie n .IP """\-f \f(CIfunction_name\f(CW""" 4
+.el .IP "\f(CW\-f \f(CIfunction_name\f(CW\fR" 4
+.IX Item "-f function_name"
+The \fB\-f\fR \fIfunction\fR option causes \f(CW\*(C`gprof\*(C'\fR to limit the
+call graph to the function \fIfunction_name\fR and its children (and
+their children...).  More than one \fB\-f\fR option may be given;
+only one \fIfunction_name\fR may be indicated with each \fB\-f\fR
+option.  
+.ie n .IP """\-F \f(CIfunction_name\f(CW""" 4
+.el .IP "\f(CW\-F \f(CIfunction_name\f(CW\fR" 4
+.IX Item "-F function_name"
+The \fB\-F\fR \fIfunction\fR option works like the \f(CW\*(C`\-f\*(C'\fR option, but
+only time spent in the function and its children (and their
+children...) will be used to determine total-time and
+percentages-of-time for the call graph.  More than one \fB\-F\fR option
+may be given; only one \fIfunction_name\fR may be indicated with each
+\&\fB\-F\fR option.  The \fB\-F\fR option overrides the \fB\-E\fR option.
+.SH "FILES"
+.IX Header "FILES"
+.ie n .IP """\f(CIa.out\f(CW""" 4
+.el .IP "\f(CW\f(CIa.out\f(CW\fR" 4
+.IX Item "a.out"
+the namelist and text space.
+.ie n .IP """\f(CIgmon.out\f(CW""" 4
+.el .IP "\f(CW\f(CIgmon.out\f(CW\fR" 4
+.IX Item "gmon.out"
+dynamic call graph and profile.
+.ie n .IP """\f(CIgmon.sum\f(CW""" 4
+.el .IP "\f(CW\f(CIgmon.sum\f(CW\fR" 4
+.IX Item "gmon.sum"
+summarized dynamic call graph and profile.  
+.SH "BUGS"
+.IX Header "BUGS"
 The granularity of the sampling is shown, but remains
 statistical at best.
@@ -247 +685 @@
 the execution of the profiling routine, in which case all is lost.
 .PP
-The profiled program must call
-.BR exit ( 2 )
+The profiled program must call \f(CW\*(C`exit\*(C'\fR(2)
 or return normally for the profiling information to be saved
-in the `gmon.out' file.
+in the \fIgmon.out\fR file.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fImonitor\fR\|(3), \fIprofil\fR\|(2), \fIcc\fR\|(1), \fIprof\fR\|(1), and the Info entry for \fIgprof\fR.
+.PP
+``An Execution Profiler for Modular Programs'',
+by S. Graham, P. Kessler, M. McKusick;
+Software \- Practice and Experience,
+Vol. 13, pp. 671\-685, 1983.
+.PP
+``gprof: A Call Graph Execution Profiler'',
+by S. Graham, P. Kessler, M. McKusick;
+Proceedings of the \s-1SIGPLAN\s0 '82 Symposium on Compiler Construction,
+\&\s-1SIGPLAN\s0 Notices, Vol. 17, No  6, pp. 120\-126, June 1982.
+.SH "COPYRIGHT"
+.IX Header "COPYRIGHT"
+Copyright (C) 1988, 92, 97, 98, 99, 2000, 2001 Free Software Foundation, Inc.
+.PP
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the \s-1GNU\s0 Free Documentation License, Version 1.1
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, with no Front-Cover Texts, and with no
+Back-Cover Texts.  A copy of the license is included in the
+section entitled \*(L"\s-1GNU\s0 Free Documentation License\*(R".

branches/GNU/src/binutils/gprof/gprof.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1983, 1998, 2001 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993, 1998, 2001, 2002
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
-#include "getopt.h"
+
 #include "libiberty.h"
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "basic_blocks.h"
 #include "call_graph.h"
@@ -28 +41 @@
 #include "hertz.h"
 #include "hist.h"
-#include "source.h"
 #include "sym_ids.h"
 #include "demangle.h"
+#include "getopt.h"
+
+static void usage PARAMS ((FILE *, int)) ATTRIBUTE_NORETURN;
+int main PARAMS ((int, char **));
 
 const char *whoami;
@@ -43 +59 @@
 int output_style = 0;
 int output_width = 80;
-bool bsd_style_output = FALSE;
-bool demangle = TRUE;
-bool discard_underscores = TRUE;
-bool ignore_direct_calls = FALSE;
-bool ignore_static_funcs = FALSE;
-bool ignore_zeros = TRUE;
-bool line_granularity = FALSE;
-bool print_descriptions = TRUE;
-bool print_path = FALSE;
-bool ignore_non_functions = FALSE;
+bfd_boolean bsd_style_output = FALSE;
+bfd_boolean demangle = TRUE;
+bfd_boolean discard_underscores = TRUE;
+bfd_boolean ignore_direct_calls = FALSE;
+bfd_boolean ignore_static_funcs = FALSE;
+bfd_boolean ignore_zeros = TRUE;
+bfd_boolean line_granularity = FALSE;
+bfd_boolean print_descriptions = TRUE;
+bfd_boolean print_path = FALSE;
+bfd_boolean ignore_non_functions = FALSE;
 File_Format file_format = FF_AUTO;
 
-bool first_output = TRUE;
+bfd_boolean first_output = TRUE;
 
 char copyright[] =
@@ -141 +157 @@
 
 static void
-DEFUN (usage, (stream, status), FILE * stream AND int status)
+usage (stream, status)
+     FILE *stream;
+     int status;
 {
   fprintf (stream, _("\
@@ -165 +183 @@
 
 int
-DEFUN (main, (argc, argv), int argc AND char **argv)
+main (argc, argv)
+     int argc;
+     char **argv;
 {
   char **sp, *str;
@@ -173 +193 @@
 #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
   setlocale (LC_MESSAGES, "");
+#endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
@@ -490 +513 @@
       sym_id_add (*sp, EXCL_TIME);
       sym_id_add (*sp, EXCL_GRAPH);
-#ifdef __alpha__
       sym_id_add (*sp, EXCL_FLAT);
-#endif
     }
 

branches/GNU/src/binutils/gprof/gprof.h

@@ -1 +1 @@
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
- *      @(#)gprof.h     5.9 (Berkeley) 6/1/90
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 #ifndef gprof_h
 #define gprof_h
 
-#include "ansidecl.h"
-
 /* Include the BFD sysdep.h file.  */
 #include "sysdep.h"
+#include "bfd.h"
 
 /* Undefine the BFD PACKAGE and VERSION macros before including the
@@ -64 +71 @@
 #include "bin-bugs.h"
 
-/*
- * These may already be defined on some systems.  We could probably
- * just use the BFD versions of these, since BFD has already dealt
- * with this problem.
- */
-#undef FALSE
-#define FALSE   0
-#undef TRUE
-#define TRUE    1
-
 #define STYLE_FLAT_PROFILE      (1<<0)
 #define STYLE_CALL_GRAPH        (1<<1)
@@ -110 +107 @@
 File_Format;
 
-typedef int bool;
 typedef unsigned char UNIT[2];  /* unit of profiling */
 
@@ -121 +117 @@
  * Command-line options:
  */
-extern int debug_level;         /* debug level */
+extern int debug_level;                 /* debug level */
 extern int output_style;
-extern int output_width;        /* controls column width in index */
-extern bool bsd_style_output;   /* as opposed to FSF style output */
-extern bool demangle;           /* demangle symbol names? */
-extern bool discard_underscores;        /* discard leading underscores? */
-extern bool ignore_direct_calls;        /* don't count direct calls */
-extern bool ignore_static_funcs;        /* suppress static functions */
-extern bool ignore_zeros;       /* ignore unused symbols/files */
-extern bool line_granularity;   /* function or line granularity? */
-extern bool print_descriptions; /* output profile description */
-extern bool print_path;         /* print path or just filename? */
-extern bool ignore_non_functions;/* Ignore non-function symbols.  */
+extern int output_width;                /* controls column width in index */
+extern bfd_boolean bsd_style_output;    /* as opposed to FSF style output */
+extern bfd_boolean demangle;            /* demangle symbol names? */
+extern bfd_boolean discard_underscores; /* discard leading underscores? */
+extern bfd_boolean ignore_direct_calls; /* don't count direct calls */
+extern bfd_boolean ignore_static_funcs; /* suppress static functions */
+extern bfd_boolean ignore_zeros;        /* ignore unused symbols/files */
+extern bfd_boolean line_granularity;    /* function or line granularity? */
+extern bfd_boolean print_descriptions;  /* output profile description */
+extern bfd_boolean print_path;          /* print path or just filename? */
+extern bfd_boolean ignore_non_functions; /* Ignore non-function symbols.  */
 
-extern File_Format file_format; /* requested file format */
+extern File_Format file_format;         /* requested file format */
 
-extern bool first_output;       /* no output so far? */
+extern bfd_boolean first_output;        /* no output so far? */
 
-extern void done PARAMS ((int status));
+extern void done PARAMS ((int status)) ATTRIBUTE_NORETURN;
 
 #endif /* gprof_h */

branches/GNU/src/binutils/gprof/gprof.info

@@ -1 @@
-This is gprof.info, produced by makeinfo version 4.0 from gprof.texi.
+This is gprof.info, produced by makeinfo version 4.3 from gprof.texi.
 
 START-INFO-DIR-ENTRY
@@ -7 +7 @@
    This file documents the gprof profiler of the GNU system.
 
-   Copyright (C) 1988, 92, 97, 98, 99, 2000 Free Software Foundation,
-Inc.
+   Copyright (C) 1988, 92, 97, 98, 99, 2000, 2001 Free Software
+Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
-     under the terms of the GNU Free Documentation License, Version 1.1
-     or any later version published by the Free Software Foundation;
-   with no Invariant Sections, with no Front-Cover Texts, and with no
-    Back-Cover Texts.  A copy of the license is included in the
-section entitled "GNU Free Documentation License".
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled "GNU
+Free Documentation License".
 
 
 Indirect:
-gprof.info-1: 718
-gprof.info-2: 48160
-gprof.info-3: 82294
+gprof.info-1: 707
+gprof.info-2: 48575
+gprof.info-3: 82712
 
 Tag Table:
 (Indirect)
-Node: Top718
-Node: Introduction1960
-Node: Compiling4289
-Node: Executing6950
-Node: Invoking9314
-Node: Output Options10728
-Node: Analysis Options17540
-Node: Miscellaneous Options20733
-Node: Deprecated Options21894
-Node: Symspecs23964
-Node: Output25785
-Node: Flat Profile26810
-Node: Call Graph31740
-Node: Primary34955
-Node: Callers37487
-Node: Subroutines39595
-Node: Cycles41395
-Node: Line-by-line48160
-Node: Annotated Source51959
-Node: Inaccuracy54820
-Node: Sampling Error55074
-Node: Assumptions57639
-Node: How do I?59107
-Node: Incompatibilities60325
-Node: Details61792
-Node: Implementation62181
-Node: File Format68073
-Node: Internals72328
-Node: Debugging80698
-Node: GNU Free Documentation License82294
+Node: Top707
+Node: Introduction1949
+Node: Compiling4278
+Node: Executing6939
+Node: Invoking9729
+Node: Output Options11143
+Node: Analysis Options17955
+Node: Miscellaneous Options21148
+Node: Deprecated Options22309
+Node: Symspecs24379
+Node: Output26200
+Node: Flat Profile27225
+Node: Call Graph32155
+Node: Primary35370
+Node: Callers37902
+Node: Subroutines40010
+Node: Cycles41810
+Node: Line-by-line48575
+Node: Annotated Source52374
+Node: Inaccuracy55235
+Node: Sampling Error55489
+Node: Assumptions58054
+Node: How do I?59522
+Node: Incompatibilities60740
+Node: Details62207
+Node: Implementation62596
+Node: File Format68488
+Node: Internals72746
+Node: Debugging81116
+Node: GNU Free Documentation License82712
 
 End Tag Table

branches/GNU/src/binutils/gprof/gprof.info-1

@@ -1 @@
-This is gprof.info, produced by makeinfo version 4.0 from gprof.texi.
+This is gprof.info, produced by makeinfo version 4.3 from gprof.texi.
 
 START-INFO-DIR-ENTRY
@@ -7 +7 @@
    This file documents the gprof profiler of the GNU system.
 
-   Copyright (C) 1988, 92, 97, 98, 99, 2000 Free Software Foundation,
-Inc.
+   Copyright (C) 1988, 92, 97, 98, 99, 2000, 2001 Free Software
+Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
-     under the terms of the GNU Free Documentation License, Version 1.1
-     or any later version published by the Free Software Foundation;
-   with no Invariant Sections, with no Front-Cover Texts, and with no
-    Back-Cover Texts.  A copy of the license is included in the
-section entitled "GNU Free Documentation License".
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled "GNU
+Free Documentation License".
 
 
@@ -206 +206 @@
 didn't get written into `gmon.out'.  The Perl script `bbconv.pl',
 included with the `gprof' source distribution, will convert a `bb.out'
-file into a format readable by `gprof'.
+file into a format readable by `gprof'.  Invoke it like this:
+
+     bbconv.pl < bb.out > BH-DATA
+
+   This translates the information in `bb.out' into a form that `gprof'
+can understand.  But you still need to tell `gprof' about the existence
+of this translated information.  To do that, include BB-DATA on the
+`gprof' command line, _along with `gmon.out'_, like this:
+
+     gprof OPTIONS EXECUTABLE-FILE gmon.out BB-DATA [YET-MORE-PROFILE-DATA-FILES...] [> OUTFILE]
 
 

branches/GNU/src/binutils/gprof/gprof.info-2

@@ -1 @@
-This is gprof.info, produced by makeinfo version 4.0 from gprof.texi.
+This is gprof.info, produced by makeinfo version 4.3 from gprof.texi.
 
 START-INFO-DIR-ENTRY
@@ -7 +7 @@
    This file documents the gprof profiler of the GNU system.
 
-   Copyright (C) 1988, 92, 97, 98, 99, 2000 Free Software Foundation,
-Inc.
+   Copyright (C) 1988, 92, 97, 98, 99, 2000, 2001 Free Software
+Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
-     under the terms of the GNU Free Documentation License, Version 1.1
-     or any later version published by the Free Software Foundation;
-   with no Invariant Sections, with no Front-Cover Texts, and with no
-    Back-Cover Texts.  A copy of the license is included in the
-section entitled "GNU Free Documentation License".
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled "GNU
+Free Documentation License".
 
 
@@ -487 +487 @@
 consists of a header containing the magic cookie and a version number,
 as well as some spare bytes available for future extensions.  All data
-in a profile data file is in the native format of the host on which the
-profile was collected.  GNU `gprof' adapts automatically to the
+in a profile data file is in the native format of the target for which
+the profile was collected.  GNU `gprof' adapts automatically to the
 byte-order in use.
 

branches/GNU/src/binutils/gprof/gprof.info-3

@@ -1 @@
-This is gprof.info, produced by makeinfo version 4.0 from gprof.texi.
+This is gprof.info, produced by makeinfo version 4.3 from gprof.texi.
 
 START-INFO-DIR-ENTRY
@@ -7 +7 @@
    This file documents the gprof profiler of the GNU system.
 
-   Copyright (C) 1988, 92, 97, 98, 99, 2000 Free Software Foundation,
-Inc.
+   Copyright (C) 1988, 92, 97, 98, 99, 2000, 2001 Free Software
+Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
-     under the terms of the GNU Free Documentation License, Version 1.1
-     or any later version published by the Free Software Foundation;
-   with no Invariant Sections, with no Front-Cover Texts, and with no
-    Back-Cover Texts.  A copy of the license is included in the
-section entitled "GNU Free Documentation License".
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled "GNU
+Free Documentation License".
 
 

branches/GNU/src/binutils/gprof/gprof.texi

@@ -19 +19 @@
 This file documents the gprof profiler of the GNU system.
 
-Copyright (C) 1988, 92, 97, 98, 99, 2000 Free Software Foundation, Inc.
+@c man begin COPYRIGHT
+Copyright (C) 1988, 92, 97, 98, 99, 2000, 2001 Free Software Foundation, Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, with no Front-Cover Texts, and with no
+Back-Cover Texts.  A copy of the license is included in the
+section entitled "GNU Free Documentation License".
+
+@c man end
+
+@ignore
+Permission is granted to process this file through Tex and print the
+results, provided the printed document carries copying permission
+notice identical to this one except for the removal of this paragraph
+(this paragraph not being relevant to the printed manual).
+
+@end ignore
+@end ifinfo
+
+@finalout
+@smallbook
+
+@titlepage
+@title GNU gprof
+@subtitle The @sc{gnu} Profiler 
+@author Jay Fenlason and Richard Stallman
+
+@page
+
+This manual describes the @sc{gnu} profiler, @code{gprof}, and how you
+can use it to determine which parts of a program are taking most of the
+execution time.  We assume that you know how to write, compile, and
+execute programs.  @sc{gnu} @code{gprof} was written by Jay Fenlason.
+
+@vskip 0pt plus 1filll
+Copyright @copyright{} 1988, 92, 97, 98, 99, 2000 Free Software Foundation, Inc.
 
       Permission is granted to copy, distribute and/or modify this document
@@ -28 +65 @@
       section entitled "GNU Free Documentation License".
 
-@ignore
-Permission is granted to process this file through Tex and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
-@end ignore
-@end ifinfo
-
-@finalout
-@smallbook
-
-@titlepage
-@title GNU gprof
-@subtitle The @sc{gnu} Profiler 
-@author Jay Fenlason and Richard Stallman
-
-@page
-
-This manual describes the @sc{gnu} profiler, @code{gprof}, and how you
-can use it to determine which parts of a program are taking most of the
-execution time.  We assume that you know how to write, compile, and
-execute programs.  @sc{gnu} @code{gprof} was written by Jay Fenlason.
-
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1988, 92, 97, 98, 99, 2000 Free Software Foundation, Inc.
-
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with no Invariant Sections, with no Front-Cover Texts, and with no
-      Back-Cover Texts.  A copy of the license is included in the
-      section entitled "GNU Free Documentation License".
-
 @end titlepage
 
-@ifinfo
+@ifnottex
 @node Top
 @top Profiling a Program: Where Does It Spend Its Time?
@@ -92 +95 @@
 * GNU Free Documentation License::  GNU Free Documentation License
 @end menu
-@end ifinfo
+@end ifnottex
 
 @node Introduction
 @chapter Introduction to Profiling
+
+@ifset man
+@c man title gprof display call graph profile data
+
+@smallexample
+@c man begin SYNOPSIS
+gprof [ -[abcDhilLsTvwxyz] ] [ -[ACeEfFJnNOpPqQZ][@var{name}] ] 
+ [ -I @var{dirs} ] [ -d[@var{num}] ] [ -k @var{from/to} ]
+ [ -m @var{min-count} ] [ -t @var{table-length} ]
+ [ --[no-]annotated-source[=@var{name}] ] 
+ [ --[no-]exec-counts[=@var{name}] ]
+ [ --[no-]flat-profile[=@var{name}] ] [ --[no-]graph[=@var{name}] ]
+ [ --[no-]time=@var{name}] [ --all-lines ] [ --brief ] 
+ [ --debug[=@var{level}] ] [ --function-ordering ] 
+ [ --file-ordering ] [ --directory-path=@var{dirs} ]
+ [ --display-unused-functions ] [ --file-format=@var{name} ]
+ [ --file-info ] [ --help ] [ --line ] [ --min-count=@var{n} ]
+ [ --no-static ] [ --print-path ] [ --separate-files ]
+ [ --static-call-graph ] [ --sum ] [ --table-length=@var{len} ]
+ [ --traditional ] [ --version ] [ --width=@var{n} ]
+ [ --ignore-non-functions ] [ --demangle[=@var{STYLE}] ]
+ [ --no-demangle ] [ @var{image-file} ] [ @var{profile-file} @dots{} ]
+@c man end
+@end smallexample
+
+@c man begin DESCRIPTION
+@code{gprof} produces an execution profile of C, Pascal, or Fortran77 
+programs.  The effect of called routines is incorporated in the profile 
+of each caller.  The profile data is taken from the call graph profile file
+(@file{gmon.out} default) which is created by programs
+that are compiled with the @samp{-pg} option of
+@code{cc}, @code{pc}, and @code{f77}.
+The @samp{-pg} option also links in versions of the library routines
+that are compiled for profiling.  @code{Gprof} reads the given object 
+file (the default is @code{a.out}) and establishes the relation between
+its symbol table and the call graph profile from @file{gmon.out}.
+If more than one profile file is specified, the @code{gprof}
+output shows the sum of the profile information in the given profile files.
+
+@code{Gprof} calculates the amount of time spent in each routine.
+Next, these times are propagated along the edges of the call graph.
+Cycles are discovered, and calls into a cycle are made to share the time
+of the cycle.
+
+@c man end
+
+@c man begin BUGS
+The granularity of the sampling is shown, but remains
+statistical at best.
+We assume that the time for each execution of a function
+can be expressed by the total time for the function divided
+by the number of times the function is called.
+Thus the time propagated along the call graph arcs to the function's
+parents is directly proportional to the number of times that
+arc is traversed.
+
+Parents that are not themselves profiled will have the time of
+their profiled children propagated to them, but they will appear
+to be spontaneously invoked in the call graph listing, and will
+not have their time propagated further.
+Similarly, signal catchers, even though profiled, will appear
+to be spontaneous (although for more obscure reasons).
+Any profiled children of signal catchers should have their times
+propagated properly, unless the signal catcher was invoked during
+the execution of the profiling routine, in which case all is lost.
+
+The profiled program must call @code{exit}(2)
+or return normally for the profiling information to be saved
+in the @file{gmon.out} file.
+@c man end
+
+@c man begin FILES
+@table @code
+@item @file{a.out}
+the namelist and text space.
+@item @file{gmon.out}
+dynamic call graph and profile.
+@item @file{gmon.sum}
+summarized dynamic call graph and profile.  
+@end table
+@c man end
+
+@c man begin SEEALSO
+monitor(3), profil(2), cc(1), prof(1), and the Info entry for @file{gprof}.
+
+``An Execution Profiler for Modular Programs'',
+by S. Graham, P. Kessler, M. McKusick;
+Software - Practice and Experience,
+Vol. 13, pp. 671-685, 1983.
+
+``gprof: A Call Graph Execution Profiler'',
+by S. Graham, P. Kessler, M. McKusick;
+Proceedings of the SIGPLAN '82 Symposium on Compiler Construction,
+SIGPLAN Notices, Vol. 17, No  6, pp. 120-126, June 1982.
+@c man end
+@end ifset
 
 Profiling allows you to learn where your program spent its time and which
@@ -130 +229 @@
 The next three chapters explain these steps in greater detail.
 
+@c man begin DESCRIPTION
+
 Several forms of output are available from the analysis.
 
@@ -146 +247 @@
 source code, labeled with the number of times each line of the
 program was executed.  @xref{Annotated Source}.
+@c man end
 
 To better understand how profiling works, you may wish to read
@@ -256 +358 @@
 The Perl script @code{bbconv.pl}, included with the @code{gprof}
 source distribution, will convert a @file{bb.out} file into
-a format readable by @code{gprof}.
+a format readable by @code{gprof}.  Invoke it like this:
+
+@smallexample
+bbconv.pl < bb.out > @var{bh-data}
+@end smallexample
+
+This translates the information in @file{bb.out} into a form that
+@code{gprof} can understand.  But you still need to tell @code{gprof}
+about the existence of this translated information.  To do that, include
+@var{bb-data} on the @code{gprof} command line, @emph{along with
+@file{gmon.out}}, like this:
+
+@smallexample
+gprof @var{options} @var{executable-file} gmon.out @var{bb-data} [@var{yet-more-profile-data-files}@dots{}] [> @var{outfile}]
+@end smallexample
 
 @node Invoking
@@ -298 +414 @@
 @section Output Options
 
+@c man begin OPTIONS
 These options specify which of several output formats
 @code{gprof} should produce.
@@ -635 +752 @@
 
 @end table
+
+@c man end
 
 Note that only one function can be specified with each @code{-e},
@@ -1732 +1851 @@
 consists of a header containing the magic cookie and a version number,
 as well as some spare bytes available for future extensions.  All data
-in a profile data file is in the native format of the host on which
-the profile was collected.  @sc{gnu} @code{gprof} adapts automatically to the
-byte-order in use.
+in a profile data file is in the native format of the target for which
+the profile was collected.  @sc{gnu} @code{gprof} adapts automatically
+to the byte-order in use.
 
 In the new file format, the header is followed by a sequence of

branches/GNU/src/binutils/gprof/hertz.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
+#include "gprof.h"
 #include "hertz.h"
 

branches/GNU/src/binutils/gprof/hertz.h

@@ -1 +1 @@
 #ifndef hertz_h
 #define hertz_h
-
-#include "gprof.h"
 
 #define HZ_WRONG 0              /* impossible clock frequency */

branches/GNU/src/binutils/gprof/hist.c

@@ -1 +1 @@
 /* hist.c  -  Histogram related operations.
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -21 +21 @@
 
 
-#include <stdio.h>
 #include "libiberty.h"
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "corefile.h"
 #include "gmon_io.h"
 #include "gmon_out.h"
 #include "hist.h"
-#include "symtab.h"
 #include "sym_ids.h"
 #include "utils.h"
@@ -35 +36 @@
 
 static void scale_and_align_entries PARAMS ((void));
+static void print_header PARAMS ((int));
+static void print_line PARAMS ((Sym *, double));
+static int cmp_time PARAMS ((const PTR, const PTR));
 
 /* Declarations of automatically generated functions to output blurbs.  */
@@ -78 +82 @@
 
 void
-DEFUN (hist_read_rec, (ifp, filename), FILE * ifp AND const char *filename)
+hist_read_rec (ifp, filename)
+     FILE * ifp;
+     const char *filename;
 {
   bfd_vma n_lowpc, n_highpc;
@@ -153 +159 @@
 
 void
-DEFUN (hist_write_hist, (ofp, filename), FILE * ofp AND const char *filename)
+hist_write_hist (ofp, filename)
+     FILE * ofp;
+     const char *filename;
 {
   UNIT count;
@@ -174 +182 @@
   for (i = 0; i < hist_num_bins; ++i)
     {
-      bfd_put_16 (core_bfd, hist_sample[i], (bfd_byte *) & count[0]);
+      bfd_put_16 (core_bfd, (bfd_vma) hist_sample[i], (bfd_byte *) &count[0]);
 
       if (fwrite (&count[0], sizeof (count), 1, ofp) != 1)
@@ -256 +264 @@
 
 void
-DEFUN_VOID (hist_assign_samples)
+hist_assign_samples ()
 {
   bfd_vma bin_low_pc, bin_high_pc;
@@ -345 +353 @@
 
 static void
-DEFUN (print_header, (prefix), const char prefix)
+print_header (prefix)
+     int prefix;
 {
   char unit[64];
@@ -384 +393 @@
 
 static void
-DEFUN (print_line, (sym, scale), Sym * sym AND double scale)
+print_line (sym, scale)
+     Sym *sym;
+     double scale;
 {
   if (ignore_zeros && sym->ncalls == 0 && sym->hist.time == 0)
@@ -421 +432 @@
 
 static int
-DEFUN (cmp_time, (lp, rp), const PTR lp AND const PTR rp)
+cmp_time (lp, rp)
+     const PTR lp;
+     const PTR rp;
 {
   const Sym *left = *(const Sym **) lp;
@@ -448 +461 @@
 
 void
-DEFUN_VOID (hist_print)
+hist_print ()
 {
   Sym **time_sorted_syms, *top_dog, *sym;
   unsigned int index;
-  int log_scale;
+  unsigned log_scale;
   double top_time, time;
   bfd_vma addr;
@@ -517 +530 @@
           top_time /= hz;
 
-          while (SItab[log_scale].scale * top_time < 1000.0
-                 && ((size_t) log_scale
-                     < sizeof (SItab) / sizeof (SItab[0]) - 1))
+          for (log_scale = 0; log_scale < ARRAY_SIZE (SItab); log_scale ++)
             {
-              ++log_scale;
+              double scaled_value = SItab[log_scale].scale * top_time;
+
+              if (scaled_value >= 1.0 && scaled_value < 1000.0) 
+                break;
             }
         }

branches/GNU/src/binutils/gprof/hist.h

@@ -23 +23 @@
 #define hist_h
 
-#include "bfd.h"
-
 extern bfd_vma s_lowpc;         /* Lowpc from the profile file.  */
 extern bfd_vma s_highpc;        /* Highpc from the profile file.  */

branches/GNU/src/binutils/gprof/i386.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1983, 2001 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993, 2001
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
 #include "corefile.h"
 #include "hist.h"
-#include "symtab.h"
 
+static int i386_iscall PARAMS ((unsigned char *));
+void i386_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
 
-int
-DEFUN (i386_iscall, (ip), unsigned char *ip)
+static int
+i386_iscall (ip)
+     unsigned char *ip;
 {
   if (*ip == 0xe8)
@@ -41 +56 @@
   unsigned char *instructp;
   Sym *child;
-  bfd_vma destpc, delta;
+  bfd_vma pc, destpc;
 
   if (core_text_space == 0)
@@ -59 +74 @@
                           (unsigned long) p_highpc));
 
-  delta = (bfd_vma) core_text_space - core_text_sect->vma;
-
-  for (instructp = (unsigned char *) (p_lowpc + delta);
-       instructp < (unsigned char *) (p_highpc + delta);
-       instructp ++)
+  for (pc = p_lowpc; pc < p_highpc; ++pc)
     {
+      instructp = (unsigned char *) core_text_space + pc - core_text_sect->vma;
       if (i386_iscall (instructp))
         {
           DBG (CALLDEBUG,
-               printf ("[findcall]\t0x%lx:call",
-                       (unsigned long) (instructp - (unsigned char *) delta)));
+               printf ("[findcall]\t0x%lx:call", (unsigned long) pc));
           /*
            *  regular pc relative addressing
@@ -76 +87 @@
            */
 
-          destpc = ((bfd_vma) bfd_get_32 (core_bfd, instructp + 1)
-                    + (bfd_vma) instructp - (bfd_vma) delta + 5);
+          destpc = bfd_get_32 (core_bfd, instructp + 1) + pc + 5;
           if (destpc >= s_lowpc && destpc <= s_highpc)
             {

branches/GNU/src/binutils/gprof/po/Make-in

@@ -71 +71 @@
 .po.gmo:
         file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-          && rm -f $$file && $(GMSGFMT) -o $$file $<
+          && test -w $$file \
+          && (rm -f $$file && $(GMSGFMT) -o $$file $< ) \
+          || echo "$$file is not writable"
 
 .po.cat:

branches/GNU/src/binutils/gprof/po/POTFILES.in

@@ -23 +23 @@
 hist.h
 i386.c
+mips.c
 search_list.c
 search_list.h

branches/GNU/src/binutils/gprof/po/gprof.pot

@@ -7 +7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-27 16:32-0700\n"
+"POT-Creation-Date: 2002-01-31 18:32+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13 +13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: alpha.c:89
+"Content-Transfer-Encoding: 8bit\n"
+
+#: alpha.c:93 mips.c:47
 msgid "<indirect child>"
 msgstr ""
 
-#: alpha.c:106
+#: alpha.c:110 mips.c:64
 #, c-format
 msgid "[find_call] %s: 0x%lx to 0x%lx\n"
 msgstr ""
 
-#: alpha.c:128
+#: alpha.c:132
 #, c-format
 msgid "[find_call] 0x%lx: jsr%s <indirect_child>\n"
 msgstr ""
 
-#: alpha.c:137
+#: alpha.c:142
 #, c-format
 msgid "[find_call] 0x%lx: bsr"
 msgstr ""
 
-#: basic_blocks.c:123 call_graph.c:86 hist.c:122
+#: basic_blocks.c:122 call_graph.c:90 hist.c:93
 #, c-format
 msgid "%s: %s: unexpected end of file\n"
 msgstr ""
 
-#: basic_blocks.c:198
+#: basic_blocks.c:190
 #, c-format
 msgid "%s: warning: ignoring basic-block exec counts (use -l or --line)\n"
@@ -45 +45 @@
 
 #. FIXME: This only works if bfd_vma is unsigned long.
-#: basic_blocks.c:296 basic_blocks.c:306
+#: basic_blocks.c:281 basic_blocks.c:291
 #, c-format
 msgid "%s:%d: (%s:0x%lx) %lu executions\n"
 msgstr ""
 
-#: basic_blocks.c:297 basic_blocks.c:307
+#: basic_blocks.c:282 basic_blocks.c:292
 msgid "<unknown>"
 msgstr ""
 
-#: basic_blocks.c:551
+#: basic_blocks.c:536
 #, c-format
 msgid ""
@@ -65 +65 @@
 msgstr ""
 
-#: basic_blocks.c:575
+#: basic_blocks.c:560
 msgid ""
 "\n"
@@ -72 +72 @@
 msgstr ""
 
-#: basic_blocks.c:576
+#: basic_blocks.c:561
 #, c-format
 msgid "%9ld   Executable lines in this file\n"
 msgstr ""
 
-#: basic_blocks.c:578
+#: basic_blocks.c:563
 #, c-format
 msgid "%9ld   Lines executed\n"
 msgstr ""
 
-#: basic_blocks.c:579
+#: basic_blocks.c:564
 #, c-format
 msgid "%9.2f   Percent of the file executed\n"
 msgstr ""
 
-#: basic_blocks.c:583
+#: basic_blocks.c:568
 #, c-format
 msgid ""
@@ -94 +94 @@
 msgstr ""
 
-#: basic_blocks.c:585
+#: basic_blocks.c:570
 #, c-format
 msgid "%9.2f   Average executions per line\n"
 msgstr ""
 
-#: call_graph.c:66
+#: call_graph.c:69
 #, c-format
 msgid "[cg_tally] arc from %s to %s traversed %lu times\n"
 msgstr ""
 
-#: cg_print.c:54
+#: cg_print.c:58
 msgid ""
 "\t\t     Call graph (explanation follows)\n"
@@ -110 +110 @@
 msgstr ""
 
-#: cg_print.c:56
+#: cg_print.c:60
 msgid ""
 "\t\t\tCall graph\n"
@@ -116 +116 @@
 msgstr ""
 
-#: cg_print.c:59 hist.c:391
+#: cg_print.c:63 hist.c:355
 #, c-format
 msgid ""
@@ -123 +123 @@
 msgstr ""
 
-#: cg_print.c:63
+#: cg_print.c:67
+#, c-format
 msgid ""
 " for %.2f%% of %.2f seconds\n"
@@ -129 +130 @@
 msgstr ""
 
-#: cg_print.c:67
+#: cg_print.c:71
 msgid ""
 " no time propagated\n"
@@ -135 +136 @@
 msgstr ""
 
-#: cg_print.c:76 cg_print.c:79 cg_print.c:81
+#: cg_print.c:80 cg_print.c:83 cg_print.c:85
 msgid "called"
 msgstr ""
 
-#: cg_print.c:76 cg_print.c:81
+#: cg_print.c:80 cg_print.c:85
 msgid "total"
 msgstr ""
 
-#: cg_print.c:76
+#: cg_print.c:80
 msgid "parents"
 msgstr ""
 
-#: cg_print.c:78 cg_print.c:79
+#: cg_print.c:82 cg_print.c:83
 msgid "index"
 msgstr ""
 
-#: cg_print.c:78
+#: cg_print.c:82
 msgid "%time"
 msgstr ""
 
-#: cg_print.c:78 cg_print.c:79
+#: cg_print.c:82 cg_print.c:83
 msgid "self"
 msgstr ""
 
-#: cg_print.c:78
-msgid "descendents"
-msgstr ""
-
-#: cg_print.c:79 hist.c:416
+#: cg_print.c:82
+msgid "descendants"
+msgstr ""
+
+#: cg_print.c:83 hist.c:381
 msgid "name"
 msgstr ""
 
-#: cg_print.c:81
+#: cg_print.c:85
 msgid "children"
 msgstr ""
 
-#: cg_print.c:86
+#: cg_print.c:90
+#, c-format
 msgid "index %% time    self  children    called     name\n"
 msgstr ""
 
-#: cg_print.c:109
+#: cg_print.c:113
 #, c-format
 msgid " <cycle %d as a whole> [%d]\n"
 msgstr ""
 
-#: cg_print.c:335
+#: cg_print.c:339
 #, c-format
 msgid "%6.6s %5.5s %7.7s %11.11s %7.7s %7.7s     <spontaneous>\n"
 msgstr ""
 
-#: cg_print.c:336
+#: cg_print.c:340
 #, c-format
 msgid "%6.6s %5.5s %7.7s %7.7s %7.7s %7.7s     <spontaneous>\n"
 msgstr ""
 
-#: cg_print.c:570
+#: cg_print.c:574
 msgid ""
 "Index by function name\n"
@@ -196 +198 @@
 msgstr ""
 
-#: cg_print.c:627 cg_print.c:636
+#: cg_print.c:631 cg_print.c:640
 #, c-format
 msgid "<cycle %d>"
 msgstr ""
 
-#: corefile.c:61
+#: corefile.c:64
 #, c-format
 msgid "%s: could not open %s.\n"
 msgstr ""
 
-#: corefile.c:75 corefile.c:109
+#: corefile.c:78 corefile.c:112
 #, c-format
 msgid "%s: unable to parse mapping file %s.\n"
 msgstr ""
 
-#: corefile.c:151
+#: corefile.c:154
 #, c-format
 msgid "%s: %s: not in a.out format\n"
 msgstr ""
 
-#: corefile.c:162
+#: corefile.c:165
 #, c-format
 msgid "%s: can't find .text section in %s\n"
 msgstr ""
 
-#: corefile.c:220
+#: corefile.c:223
 #, c-format
 msgid "%s: ran out room for %lu bytes of text space\n"
 msgstr ""
 
-#: corefile.c:234
+#: corefile.c:237
 #, c-format
 msgid "%s: can't do -c\n"
 msgstr ""
 
-#: corefile.c:265
+#: corefile.c:272
 #, c-format
 msgid "%s: -c not supported on architecture %s\n"
 msgstr ""
 
-#: corefile.c:432
+#: corefile.c:439
 #, c-format
 msgid "%s: file `%s' has no symbols\n"
 msgstr ""
 
-#: corefile.c:732
+#: corefile.c:739
 #, c-format
 msgid "%s: somebody miscounted: ltab.len=%d instead of %ld\n"
 msgstr ""
 
-#: gmon_io.c:50 gmon_io.c:71
-#, c-format
-msgid "%s: bfd_vma has unexpected size of %ld bytes\n"
-msgstr ""
-
-#: gmon_io.c:107 gmon_io.c:199
+#: gmon_io.c:83 gmon_io.c:137 gmon_io.c:188 gmon_io.c:216 gmon_io.c:386
+#: gmon_io.c:413 gmon_io.c:609 gmon_io.c:634
+#, c-format
+msgid "%s: bits per address has unexpected value of %u\n"
+msgstr ""
+
+#: gmon_io.c:252 gmon_io.c:347
 #, c-format
 msgid "%s: file too short to be a gmon file\n"
 msgstr ""
 
-#: gmon_io.c:117 gmon_io.c:233
+#: gmon_io.c:262 gmon_io.c:396
 #, c-format
 msgid "%s: file `%s' has bad magic cookie\n"
 msgstr ""
 
-#: gmon_io.c:128
+#: gmon_io.c:273
 #, c-format
 msgid "%s: file `%s' has unsupported version %d\n"
 msgstr ""
 
-#: gmon_io.c:158
+#: gmon_io.c:303
 #, c-format
 msgid "%s: %s: found bad tag %d (file corrupted?)\n"
 msgstr ""
 
-#: gmon_io.c:221
+#: gmon_io.c:369
 #, c-format
 msgid "%s: profiling rate incompatible with first gmon file\n"
 msgstr ""
 
-#: gmon_io.c:250
+#: gmon_io.c:429
 #, c-format
 msgid "%s: incompatible with first gmon file\n"
 msgstr ""
 
-#: gmon_io.c:278
+#: gmon_io.c:457
 #, c-format
 msgid "%s: file '%s' does not appear to be in gmon.out format\n"
 msgstr ""
 
-#: gmon_io.c:299
+#: gmon_io.c:478
 #, c-format
 msgid "%s: unexpected EOF after reading %d/%d bins\n"
 msgstr ""
 
-#: gmon_io.c:335
+#: gmon_io.c:511
 msgid "time is in ticks, not seconds\n"
 msgstr ""
 
-#: gmon_io.c:341 gmon_io.c:475
+#: gmon_io.c:517 gmon_io.c:704
 #, c-format
 msgid "%s: don't know how to deal with file format %d\n"
 msgstr ""
 
-#: gmon_io.c:348
+#: gmon_io.c:524
 #, c-format
 msgid "File `%s' (version %d) contains:\n"
 msgstr ""
 
-#: gmon_io.c:350
-#, c-format
-msgid "\t%d histogram record%s\n"
-msgstr ""
-
-#: gmon_io.c:352
-#, c-format
-msgid "\t%d call-graph record%s\n"
-msgstr ""
-
-#: gmon_io.c:354
-#, c-format
-msgid "\t%d basic-block count record%s\n"
-msgstr ""
-
-#: gprof.c:145
+#: gmon_io.c:527
+#, c-format
+msgid "\t%d histogram record\n"
+msgstr ""
+
+#: gmon_io.c:528
+#, c-format
+msgid "\t%d histogram records\n"
+msgstr ""
+
+#: gmon_io.c:530
+#, c-format
+msgid "\t%d call-graph record\n"
+msgstr ""
+
+#: gmon_io.c:531
+#, c-format
+msgid "\t%d call-graph records\n"
+msgstr ""
+
+#: gmon_io.c:533
+#, c-format
+msgid "\t%d basic-block count record\n"
+msgstr ""
+
+#: gmon_io.c:534
+#, c-format
+msgid "\t%d basic-block count records\n"
+msgstr ""
+
+#: gprof.c:147
 #, c-format
 msgid ""
@@ -338 +356 @@
 msgstr ""
 
-#: gprof.c:161
+#: gprof.c:163
 #, c-format
 msgid "Report bugs to %s\n"
 msgstr ""
 
-#: gprof.c:230
+#: gprof.c:235
 #, c-format
 msgid "%s: debugging not supported; -d ignored\n"
 msgstr ""
 
-#: gprof.c:310
+#: gprof.c:315
 #, c-format
 msgid "%s: unknown file format %s\n"
@@ -354 +372 @@
 
 #. This output is intended to follow the GNU standards document.
-#: gprof.c:394
+#: gprof.c:399
 #, c-format
 msgid "GNU gprof %s\n"
 msgstr ""
 
-#: gprof.c:395
+#: gprof.c:400
 msgid ""
 "Based on BSD gprof, copyright 1983 Regents of the University of California.\n"
 msgstr ""
 
-#: gprof.c:396
+#: gprof.c:401
 msgid ""
 "This program is free software.  This program has absolutely no warranty.\n"
 msgstr ""
 
-#: gprof.c:437
+#: gprof.c:442
 #, c-format
 msgid "%s: unknown demangling style `%s'\n"
 msgstr ""
 
-#: gprof.c:457
+#: gprof.c:462
 #, c-format
 msgid ""
@@ -380 +398 @@
 msgstr ""
 
-#: gprof.c:557
+#: gprof.c:562
 #, c-format
 msgid "%s: sorry, file format `prof' is not yet supported\n"
 msgstr ""
 
-#: gprof.c:618
+#: gprof.c:623
 #, c-format
 msgid "%s: gmon.out file is missing histogram\n"
 msgstr ""
 
-#: gprof.c:625
+#: gprof.c:630
 #, c-format
 msgid "%s: gmon.out file is missing call-graph data\n"
 msgstr ""
 
-#: hist.c:158
+#: hist.c:122
 #, c-format
 msgid "%s: `%s' is incompatible with first gmon file\n"
 msgstr ""
 
-#: hist.c:174
+#: hist.c:138
 #, c-format
 msgid "%s: %s: unexpected EOF after reading %d of %d samples\n"
 msgstr ""
 
-#: hist.c:387
+#: hist.c:351
 #, c-format
 msgid "%c%c/call"
 msgstr ""
 
-#: hist.c:395
+#: hist.c:359
+#, c-format
 msgid ""
 " for %.2f%% of %.2f %s\n"
@@ -416 +435 @@
 msgstr ""
 
-#: hist.c:401
+#: hist.c:365
 #, c-format
 msgid ""
@@ -423 +442 @@
 msgstr ""
 
-#: hist.c:406
+#: hist.c:370
 msgid ""
 " no time accumulated\n"
@@ -429 +448 @@
 msgstr ""
 
-#: hist.c:413
+#: hist.c:377
 msgid "cumulative"
 msgstr ""
 
-#: hist.c:413
+#: hist.c:377
 msgid "self  "
 msgstr ""
 
-#: hist.c:413
+#: hist.c:377
 msgid "total "
 msgstr ""
 
-#: hist.c:415
+#: hist.c:380
 msgid "time"
 msgstr ""
 
-#: hist.c:415
+#: hist.c:380
 msgid "calls"
 msgstr ""
 
-#: hist.c:504
+#: hist.c:469
 msgid ""
 "\n"
@@ -457 +476 @@
 msgstr ""
 
-#: hist.c:510
+#: hist.c:475
 msgid "Flat profile:\n"
 msgstr ""
 
+#: mips.c:75
+#, c-format
+msgid "[find_call] 0x%lx: jal"
+msgstr ""
+
+#: mips.c:100
+#, c-format
+msgid "[find_call] 0x%lx: jalr\n"
+msgstr ""
+
 #: source.c:163
 #, c-format
@@ -471 +500 @@
 msgstr ""
 
-#: utils.c:93
+#: utils.c:96
 #, c-format
 msgid " <cycle %d>"

branches/GNU/src/binutils/gprof/search_list.c

@@ -1 +1 @@
 /* search-list.c
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -27 +27 @@
 
 void
-DEFUN (search_list_append, (list, paths),
-       Search_List * list AND const char *paths)
+search_list_append (list, paths)
+     Search_List *list;
+     const char *paths;
 {
   Search_List_Elem *new_el;
   const char *beg, *colon;
-  int len;
+  unsigned int len;
 
   colon = paths - 1;

branches/GNU/src/binutils/gprof/source.c

@@ -1 +1 @@
 /* source.c - Keep track of source files.
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -30 +30 @@
 
 /* Default option values.  */
-bool create_annotation_files = FALSE;
+bfd_boolean create_annotation_files = FALSE;
 
 Search_List src_search_list = {0, 0};
@@ -37 +37 @@
 
 Source_File *
-DEFUN (source_file_lookup_path, (path), const char *path)
+source_file_lookup_path (path)
+     const char *path;
 {
   Source_File *sf;
@@ -64 +65 @@
 
 Source_File *
-DEFUN (source_file_lookup_name, (filename), const char *filename)
+source_file_lookup_name (filename)
+     const char *filename;
 {
   const char *fname;
@@ -91 +93 @@
 
 FILE *
-DEFUN (annotate_source, (sf, max_width, annote, arg),
-       Source_File * sf AND int max_width
-       AND void (*annote) PARAMS ((char *buf, int w, int l, void *arg))
-       AND void *arg)
+annotate_source (sf, max_width, annote, arg)
+     Source_File *sf;
+     unsigned int max_width;
+     void (*annote) PARAMS ((char *, unsigned int, int, void *));
+     void *arg;
 {
-  static bool first_file = TRUE;
+  static bfd_boolean first_file = TRUE;
   int i, line_num, nread;
-  bool new_line;
+  bfd_boolean new_line;
   char buf[8192];
   char fname[PATH_MAX];

branches/GNU/src/binutils/gprof/source.h

@@ -1 +1 @@
 /* source.h
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Binutils.
@@ -23 +23 @@
 #define source_h
 
-#include <stdio.h>
-#include "gprof.h"
-#include "search_list.h"
-
 typedef struct source_file
   {
@@ -39 +35 @@
 
 /* Options.  */
-extern bool create_annotation_files;    /* Create annotated output files?  */
+
+/* Create annotated output files?  */
+extern bfd_boolean create_annotation_files;
 
 /* List of directories to search for source files.  */
@@ -59 +57 @@
    that summary statistics can be printed.  If the returned file
    is not stdout, it should be closed when done with it.  */
-extern FILE *annotate_source PARAMS ((Source_File * sf, int max_width,
-                                      void (*annote) (char *b, int w, int l,
-                                                      void *arg),
-                                      void *arg));
+extern FILE *annotate_source
+  PARAMS ((Source_File *sf, unsigned int max_width,
+           void (*annote) (char *, unsigned int, int, PTR arg),
+           PTR arg));
 #endif /* source_h */

branches/GNU/src/binutils/gprof/sparc.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
 #include "corefile.h"
 #include "hist.h"
-#include "symtab.h"
 
     /*
@@ -27 +39 @@
      */
 #define CALL    (0xc0000000)
+
+void sparc_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
 
 void
@@ -34 +48 @@
      bfd_vma p_highpc;
 {
-  bfd_vma dest_pc, delta;
-  unsigned int *instr;
+  bfd_vma pc, dest_pc;
+  unsigned int insn;
   Sym *child;
-
-  delta = (bfd_vma) core_text_space - core_text_sect->vma;
 
   if (core_text_space == 0)
@@ -55 +67 @@
                           parent->name, (unsigned long) p_lowpc,
                           (unsigned long) p_highpc));
-  for (instr = (unsigned int *) (((p_lowpc + delta) + 3) &~ 3);
-       instr < (unsigned int *) (p_highpc + delta);
-       ++instr)
+  for (pc = (p_lowpc + 3) & ~(bfd_vma) 3; pc < p_highpc; pc += 4)
     {
-      if ((*instr & CALL))
+      insn = bfd_get_32 (core_bfd, ((unsigned char *) core_text_space
+                                    + pc - core_text_sect->vma));
+      if (insn & CALL)
         {
           DBG (CALLDEBUG,
-               printf ("[find_call] 0x%lx: callf",
-                       (unsigned long) instr - delta));
+               printf ("[find_call] 0x%lx: callf", (unsigned long) pc));
           /*
            * Regular pc relative addressing check that this is the
            * address of a function.
            */
-          dest_pc = ((bfd_vma) (instr + (*instr & ~CALL))) - delta;
+          dest_pc = pc + (((bfd_signed_vma) (insn & 0x3fffffff)
+                           ^ 0x20000000) - 0x20000000);
           if (dest_pc >= s_lowpc && dest_pc <= s_highpc)
             {

branches/GNU/src/binutils/gprof/sym_ids.c

@@ -1 +1 @@
 /* sym_ids.c
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -21 +21 @@
 
 
-#include <ctype.h>
-
 #include "libiberty.h"
+#include "safe-ctype.h"
+#include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
 #include "sym_ids.h"
@@ -32 +35 @@
     char *spec;                 /* Parsing modifies this.  */
     Table_Id which_table;
-    bool has_right;
+    bfd_boolean has_right;
 
     struct match
@@ -45 +48 @@
  *id_list;
 
+static void parse_spec
+  PARAMS ((char *, Sym *));
+static void parse_id
+  PARAMS ((struct sym_id *));
+static bfd_boolean match
+  PARAMS ((Sym *, Sym *));
+static void extend_match
+  PARAMS ((struct match *, Sym *, Sym_Table *, bfd_boolean));
+
+
 Sym_Table syms[NUM_TABLES];
 
@@ -73 +86 @@
 
 void
-DEFUN (sym_id_add, (spec, which_table),
-       const char *spec AND Table_Id which_table)
+sym_id_add (spec, which_table)
+     const char *spec;
+     Table_Id which_table;
 {
   struct sym_id *id;
@@ -102 +116 @@
 
 static void
-DEFUN (parse_spec, (spec, sym), char *spec AND Sym * sym)
+parse_spec (spec, sym)
+     char *spec;
+     Sym *sym;
 {
   char *colon;
@@ -125 +141 @@
       if (strlen (spec))
         {
-          if (isdigit ((unsigned char) spec[0]))
+          if (ISDIGIT (spec[0]))
             sym->line_num = atoi (spec);
           else
@@ -141 +157 @@
             sym->file = &non_existent_file;
         }
-      else if (isdigit ((unsigned char) *spec))
+      else if (ISDIGIT (*spec))
         {
           sym->line_num = atoi (spec);
@@ -157 +173 @@
 
 static void
-DEFUN (parse_id, (id), struct sym_id *id)
+parse_id (id)
+     struct sym_id *id;
 {
   char *slash;
@@ -205 +222 @@
 /* Return TRUE iff PATTERN matches SYM.  */
 
-static bool
-DEFUN (match, (pattern, sym), Sym * pattern AND Sym * sym)
+static bfd_boolean
+match (pattern, sym)
+     Sym *pattern;
+     Sym *sym;
 {
   return (pattern->file ? pattern->file == sym->file : TRUE)
@@ -218 +237 @@
 
 static void
-DEFUN (extend_match, (m, sym, tab, second_pass),
-     struct match *m AND Sym * sym AND Sym_Table * tab AND bool second_pass)
+extend_match (m, sym, tab, second_pass)
+     struct match *m;
+     Sym *sym;
+     Sym_Table *tab;
+     bfd_boolean second_pass;
 {
   if (m->prev_match != sym - 1)
@@ -254 +276 @@
 
 void
-DEFUN_VOID (sym_id_parse)
+sym_id_parse ()
 {
   Sym *sym, *left, *right;
@@ -352 +374 @@
    very big (the user has to type them!), so a linear search is probably
    tolerable.  */
-bool
-DEFUN (sym_id_arc_is_present, (symtab, from, to),
-       Sym_Table * symtab AND Sym * from AND Sym * to)
+bfd_boolean
+sym_id_arc_is_present (sym_tab, from, to)
+     Sym_Table *sym_tab;
+     Sym *from;
+     Sym *to;
 {
   Sym *sym;
 
-  for (sym = symtab->base; sym < symtab->limit; ++sym)
+  for (sym = sym_tab->base; sym < sym_tab->limit; ++sym)
     {
       if (from->addr >= sym->addr && from->addr <= sym->end_addr

branches/GNU/src/binutils/gprof/sym_ids.h

@@ -1 +1 @@
 /* sym_ids.h
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Binutils.
@@ -23 +23 @@
 #define sym_ids_h
 
-#include "symtab.h"
-
 typedef enum
   {
@@ -39 +37 @@
 extern Sym_Table syms[NUM_TABLES];
 
-extern void sym_id_add             PARAMS ((const char *, Table_Id));
-extern void sym_id_parse           PARAMS ((void));
-extern bool sym_id_arc_is_present  PARAMS ((Sym_Table *, Sym *, Sym *));
+extern void sym_id_add PARAMS ((const char *, Table_Id));
+extern void sym_id_parse PARAMS ((void));
+extern bfd_boolean sym_id_arc_is_present PARAMS ((Sym_Table *, Sym *, Sym *));
 
 #endif /* sym_ids_h */

branches/GNU/src/binutils/gprof/symtab.c

@@ -1 +1 @@
 /* symtab.c
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -22 +22 @@
 
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
 #include "corefile.h"
-#include "symtab.h"
+
+static int cmp_addr PARAMS ((const PTR, const PTR));
 
 Sym_Table symtab;
@@ -32 +36 @@
 
 void
-DEFUN (sym_init, (sym), Sym * sym)
+sym_init (sym)
+     Sym *sym;
 {
   memset (sym, 0, sizeof (*sym));
@@ -56 +61 @@
 
 static int
-DEFUN (cmp_addr, (lp, rp), const PTR lp AND const PTR rp)
-{
-  Sym *left = (Sym *) lp;
-  Sym *right = (Sym *) rp;
+cmp_addr (lp, rp)
+     const PTR lp;
+     const PTR rp;
+{
+  const Sym *left = (const Sym *) lp;
+  const Sym *right = (const Sym *) rp;
 
   if (left->addr > right->addr)
@@ -74 +81 @@
 
 void
-DEFUN (symtab_finalize, (tab), Sym_Table * tab)
+symtab_finalize (tab)
+     Sym_Table *tab;
 {
   Sym *src, *dst;
@@ -171 +179 @@
 
 Sym *
-DEFUN (dbg_sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address)
+dbg_sym_lookup (sym_tab, address)
+     Sym_Table *sym_tab;
+     bfd_vma address;
 {
   long low, mid, high;
@@ -179 +189 @@
            (unsigned long) address);
 
-  sym = symtab->base;
-  for (low = 0, high = symtab->len - 1; low != high;)
+  sym = sym_tab->base;
+  for (low = 0, high = sym_tab->len - 1; low != high;)
     {
       mid = (high + low) >> 1;
@@ -210 +220 @@
    If address does not hit any symbol, 0 is returned.  */
 Sym *
-DEFUN (sym_lookup, (symtab, address), Sym_Table * symtab AND bfd_vma address)
+sym_lookup (sym_tab, address)
+     Sym_Table *sym_tab;
+     bfd_vma address;
 {
   long low, high;
@@ -219 +231 @@
 #endif /* DEBUG */
 
-  if (!symtab->len)
+  if (!sym_tab->len)
     return 0;
 
-  sym = symtab->base;
-  for (low = 0, high = symtab->len - 1; low != high;)
+  sym = sym_tab->base;
+  for (low = 0, high = sym_tab->len - 1; low != high;)
     {
       DBG (LOOKUPDEBUG, ++probes);
@@ -240 +252 @@
               DBG (LOOKUPDEBUG,
                    printf ("[sym_lookup] %d probes (symtab->len=%u)\n",
-                           probes, symtab->len - 1));
+                           probes, sym_tab->len - 1));
               return &sym[mid];
             }
@@ -261 +273 @@
         {
           DBG (LOOKUPDEBUG, printf ("[sym_lookup] %d (%u) probes, fall off\n",
-                                    probes, symtab->len - 1));
+                                    probes, sym_tab->len - 1));
           return &sym[mid + 1];
         }

branches/GNU/src/binutils/gprof/symtab.h

@@ -1 +1 @@
 /* symtab.h
 
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Binutils.
@@ -23 +23 @@
 #define symtab_h
 
-#include "bfd.h"
-#include "gprof.h"
-
 /* For a profile to be intelligible to a human user, it is necessary
    to map code-addresses into source-code information.  Source-code
@@ -33 +30 @@
    The symbol table is used to map addresses into source-code
    information.  */
-
-#include "source.h"
 
 #define NBBS 10
@@ -84 +79 @@
         int index;              /* Index in the graph list.  */
         int top_order;          /* Graph call chain top-sort order.  */
-        bool print_flag;        /* Should this be printed?  */
+        bfd_boolean print_flag; /* Should this be printed?  */
         struct
           {
@@ -120 +115 @@
 extern void sym_init        PARAMS ((Sym *));
 extern void symtab_finalize PARAMS ((Sym_Table *));
+#ifdef DEBUG
+extern Sym *dbg_sym_lookup  PARAMS ((Sym_Table *, bfd_vma));
+#endif
 extern Sym *sym_lookup      PARAMS ((Sym_Table *, bfd_vma));
 extern void find_call       PARAMS ((Sym *, bfd_vma, bfd_vma));

branches/GNU/src/binutils/gprof/tahoe.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1983, 2001 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993, 2001
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
 #include "corefile.h"
 #include "hist.h"
-#include "symtab.h"
 
     /*
@@ -45 +57 @@
  * A symbol to be the child of indirect callf:
  */
-Sym indirectchild;
-
-
-tahoe_operandenum
+static Sym indirectchild;
+
+static tahoe_operandenum tahoe_operandmode PARAMS ((unsigned char *));
+static char *tahoe_operandname PARAMS ((tahoe_operandenum));
+static long tahoe_operandlength PARAMS ((unsigned char *));
+static bfd_signed_vma tahoe_offset PARAMS ((unsigned char *));
+void tahoe_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
+
+static tahoe_operandenum
 tahoe_operandmode (modep)
      unsigned char *modep;
 {
-  long usesreg = ((long) *modep) & 0xf;
-
-  switch (((long) *modep) >> 4)
+  long usesreg = *modep & 0xf;
+
+  switch ((*modep >> 4) & 0xf)
     {
     case 0:
@@ -90 +107 @@
 }
 
-char *
+static char *
 tahoe_operandname (mode)
      tahoe_operandenum mode;
@@ -144 +161 @@
 }
 
-long
+static long
 tahoe_operandlength (modep)
      unsigned char *modep;
@@ -182 +199 @@
 }
 
-bfd_vma
-tahoe_reladdr (modep)
-     char *modep;
+static bfd_signed_vma
+tahoe_offset (modep)
+     unsigned char *modep;
 {
   tahoe_operandenum mode = tahoe_operandmode (modep);
-  char *cp;
-  short *sp;
-  long *lp;
-  int i;
-  long value = 0;
-
-  cp = modep;
-  ++cp;                         /* skip over the mode */
+
+  ++modep;                              /* skip over the mode */
   switch (mode)
     {
     default:
       fprintf (stderr, "[reladdr] not relative address\n");
-      return (bfd_vma) modep;
+      return 0;
     case byterel:
-      return (bfd_vma) (cp + sizeof *cp + *cp);
+      return 1 + bfd_get_signed_8 (core_bfd, modep);
     case wordrel:
-      for (i = 0; (size_t) i < sizeof *sp; i++)
-        value = (value << 8) + (cp[i] & 0xff);
-      return (bfd_vma) (cp + sizeof *sp + value);
+      return 2 + bfd_get_signed_16 (core_bfd, modep);
     case longrel:
-      for (i = 0; (size_t) i < sizeof *lp; i++)
-        value = (value << 8) + (cp[i] & 0xff);
-      return (bfd_vma) (cp + sizeof *lp + value);
+      return 4 + bfd_get_signed_32 (core_bfd, modep);
     }
 }
@@ -224 +231 @@
   tahoe_operandenum mode;
   tahoe_operandenum firstmode;
-  bfd_vma destpc;
-  static bool inited = FALSE;
+  bfd_vma pc, destpc;
+  static bfd_boolean inited = FALSE;
 
   if (!inited)
@@ -250 +257 @@
                           parent->name, (unsigned long) p_lowpc,
                           (unsigned long) p_highpc));
-  for (instructp = (unsigned char *) core_text_space + p_lowpc;
-       instructp < (unsigned char *) core_text_space + p_highpc;
-       instructp += length)
+  for (pc = p_lowpc; pc < p_highpc; pc += length)
     {
       length = 1;
-      if (*instructp == CALLF)
+      instructp = ((unsigned char *) core_text_space
+                   + pc - core_text_sect->vma);
+      if ((*instructp & 0xff) == CALLF)
         {
           /*
@@ -262 +269 @@
            */
           DBG (CALLDEBUG, printf ("[findcall]\t0x%lx:callf",
-                                  ((unsigned long)
-                                   (instructp
-                                    - (unsigned char *) core_text_space))));
+                                  (unsigned long) pc));
           firstmode = tahoe_operandmode (instructp + length);
           switch (firstmode)
@@ -308 +313 @@
                *      a function.
                */
-              destpc = tahoe_reladdr (instructp + length)
-                - (bfd_vma) core_text_space;
+              destpc = pc + tahoe_offset (instructp + length);
               if (destpc >= s_lowpc && destpc <= s_highpc)
                 {

branches/GNU/src/binutils/gprof/utils.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1983, 1998, 2001 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993, 2001
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
-#include <demangle.h>
+#include "demangle.h"
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
-#include "symtab.h"
+#include "utils.h"
 
 
@@ -27 +40 @@
  */
 int
-DEFUN (print_name_only, (self), Sym * self)
+print_name_only (self)
+     Sym *self;
 {
   const char *name = self->name;
@@ -86 +100 @@
 
 void
-DEFUN (print_name, (self), Sym * self)
+print_name (self)
+     Sym *self;
 {
   print_name_only (self);

branches/GNU/src/binutils/gprof/vax.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1983, 2001 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993, 2001
+ *      The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 #include "gprof.h"
+#include "search_list.h"
+#include "source.h"
+#include "symtab.h"
 #include "cg_arcs.h"
 #include "corefile.h"
 #include "hist.h"
-#include "symtab.h"
 
     /*
@@ -42 +54 @@
 typedef enum opermodes operandenum;
 
+#if 0
+/* Here to document only.  We can't use this when cross compiling as
+   the bitfield layout might not be the same as native.  */
 struct modebyte
   {
@@ -47 +62 @@
     unsigned int modefield:4;
   };
+#endif
 
 /*
  * A symbol to be the child of indirect calls:
  */
-Sym indirectchild;
-
+static Sym indirectchild;
+
+static operandenum vax_operandmode PARAMS ((unsigned char *));
+static char *vax_operandname PARAMS ((operandenum));
+static long vax_operandlength PARAMS ((unsigned char *));
+static bfd_signed_vma vax_offset PARAMS ((unsigned char *));
+void vax_find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
 
 static operandenum
 vax_operandmode (modep)
-     struct modebyte *modep;
-{
-  long usesreg = modep->regfield;
-
-  switch (modep->modefield)
+     unsigned char *modep;
+{
+  int usesreg = *modep & 0xf;
+
+  switch ((*modep >> 4) & 0xf)
     {
     case 0:
@@ -152 +173 @@
 static long
 vax_operandlength (modep)
-     struct modebyte *modep;
+     unsigned char *modep;
 {
 
@@ -182 +203 @@
       return 5;
     case indexed:
-      return 1 + vax_operandlength ((struct modebyte *) ((char *) modep) + 1);
+      return 1 + vax_operandlength (modep + 1);
     }
   /* NOTREACHED */
@@ -188 +209 @@
 }
 
-static bfd_vma
-vax_reladdr (modep)
-     struct modebyte *modep;
+static bfd_signed_vma
+vax_offset (modep)
+     unsigned char *modep;
 {
   operandenum mode = vax_operandmode (modep);
-  char *cp;
-  short *sp;
-  long *lp;
-
-  cp = (char *) modep;
-  ++cp;                         /* skip over the mode */
+
+  ++modep;                              /* skip over the mode */
   switch (mode)
     {
     default:
       fprintf (stderr, "[reladdr] not relative address\n");
-      return (bfd_vma) modep;
+      return 0;
     case byterel:
-      return (bfd_vma) (cp + sizeof *cp + *cp);
+      return 1 + bfd_get_signed_8 (core_bfd, modep);
     case wordrel:
-      sp = (short *) cp;
-      return (bfd_vma) (cp + sizeof *sp + *sp);
+      return 2 + bfd_get_signed_16 (core_bfd, modep);
     case longrel:
-      lp = (long *) cp;
-      return (bfd_vma) (cp + sizeof *lp + *lp);
+      return 4 + bfd_get_signed_32 (core_bfd, modep);
     }
 }
@@ -227 +242 @@
   operandenum mode;
   operandenum firstmode;
-  bfd_vma destpc;
-  static bool inited = FALSE;
+  bfd_vma pc, destpc;
+  static bfd_boolean inited = FALSE;
 
   if (!inited)
@@ -253 +268 @@
                           parent->name, (unsigned long) p_lowpc,
                           (unsigned long) p_highpc));
-  for (instructp = (unsigned char *) core_text_space + p_lowpc;
-       instructp < (unsigned char *) core_text_space + p_highpc;
-       instructp += length)
+  for (pc = p_lowpc; pc < p_highpc; pc += length)
     {
       length = 1;
-      if (*instructp == CALLS)
+      instructp = ((unsigned char *) core_text_space
+                   + pc - core_text_sect->vma);
+      if ((*instructp & 0xff) == CALLS)
         {
           /*
@@ -265 +280 @@
            */
           DBG (CALLDEBUG,
-               printf ("[findcall]\t0x%lx:calls",
-                       ((unsigned long)
-                        (instructp - (unsigned char *) core_text_space))));
-          firstmode = vax_operandmode ((struct modebyte *) (instructp + length));
+               printf ("[findcall]\t0x%lx:calls", (unsigned long) pc));
+          firstmode = vax_operandmode (instructp + length);
           switch (firstmode)
             {
@@ -277 +290 @@
               goto botched;
             }
-          length += vax_operandlength ((struct modebyte *) (instructp + length));
-          mode = vax_operandmode ((struct modebyte *) (instructp + length));
+          length += vax_operandlength (instructp + length);
+          mode = vax_operandmode (instructp + length);
           DBG (CALLDEBUG,
                printf ("\tfirst operand is %s", vax_operandname (firstmode));
@@ -300 +313 @@
                */
               arc_add (parent, &indirectchild, (unsigned long) 0);
-              length += vax_operandlength (
-                                  (struct modebyte *) (instructp + length));
+              length += vax_operandlength (instructp + length);
               continue;
             case byterel:
@@ -311 +323 @@
                *      a function.
                */
-              destpc = vax_reladdr ((struct modebyte *) (instructp + length))
-                - (bfd_vma) core_text_space;
+              destpc = pc + vax_offset (instructp + length);
               if (destpc >= s_lowpc && destpc <= s_highpc)
                 {
@@ -329 +340 @@
                        */
                       arc_add (parent, child, (unsigned long) 0);
-                      length += vax_operandlength ((struct modebyte *)
-                                                   (instructp + length));
+                      length += vax_operandlength (instructp + length);
                       continue;
                     }