Resolve other problems that dumb cvs can't find out by itself.

(trivial part done, `interesting' patches remain)

15 files changed, 4 insertions, 1122 deletions

diff --git a/gnu/usr.bin/binutils/gprof/__bb_exit_func.c b/gnu/usr.bin/binutils/gprof/__bb_exit_func.c
deleted file mode 100644
index 813321566c7..00000000000
--- a/gnu/usr.bin/binutils/gprof/__bb_exit_func.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1994 David Mosberger-Tang.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2, or (at
- * your option) any later version.
- *
- * __bb_exit_func() dumps all the basic-block statistics linked into
- * the bb_head chain to .d files.
- */
-#include <stdio.h>
-#include <strings.h>
-#include "bfd.h"
-#include "gmon_out.h"
-
-/* structure emitted by -a */
-struct bb {
-    long		zero_word;
-    const char		*filename;
-    long		*counts;
-    long		ncounts;
-    struct bb		*next;
-    const unsigned long	*addresses;
-};
-
-struct bb *__bb_head = (struct bb *)0;
-
-
-void
-__bb_exit_func (void)
-{
-    const int version = GMON_VERSION;
-    struct gmon_hdr ghdr;
-    struct bb *ptr;
-    FILE *fp;
-    /*
-     * GEN_GMON_CNT_FILE should be defined on systems with mcleanup()
-     * functions that do not write basic-block to gmon.out.  In such
-     * cases profiling with "-pg -a" would result in a gmon.out file
-     * without basic-block info (because the file written here would
-     * be overwritten.  Thus, a separate file is generated instead.
-     * The two files can easily be combined by specifying them
-     * on gprof's command line (and possibly generating a gmon.sum
-     * file with "gprof -s").
-     */
-#ifndef GEN_GMON_CNT_FILE
-#   define OUT_NAME	"gmon.out"
-#else
-#   define OUT_NAME	"gmon.cnt"
-#endif
-    fp = fopen(OUT_NAME, "wb");
-    if (!fp) {
-	perror(OUT_NAME);
-	return;
-    } /* if */
-    memcpy(&ghdr.cookie[0], GMON_MAGIC, 4);
-    memcpy(&ghdr.version, &version, sizeof(version));
-    fwrite(&ghdr, sizeof(ghdr), 1, fp);
-
-    for (ptr = __bb_head; ptr != 0; ptr = ptr->next) {
-	u_int ncounts = ptr->ncounts;
-	u_char tag;
-	u_int i;
-
-	tag = GMON_TAG_BB_COUNT;
-	fwrite(&tag, sizeof(tag), 1, fp);
-	fwrite(&ncounts, sizeof(ncounts), 1, fp);
-
-	for (i = 0; i < ncounts; ++i) {
-	    fwrite(&ptr->addresses[i], sizeof(ptr->addresses[0]), 1, fp);
-	    fwrite(&ptr->counts[i], sizeof(ptr->counts[0]), 1, fp);
-	} /* for */
-    } /* for */
-    fclose (fp);
-} /* __bb_exit_func */
-
-			/*** end of __bb_exit_func.c ***/
diff --git a/gnu/usr.bin/binutils/gprof/alpha.h b/gnu/usr.bin/binutils/gprof/alpha.h
deleted file mode 100644
index b91324ed8db..00000000000
--- a/gnu/usr.bin/binutils/gprof/alpha.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 1983 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.
- *
- *      @(#)alpha.h     1.4 (Berkeley) 6/1/90
- */
-#ifndef alpha_h
-#define alpha_h
-
-/*
- * Offset (in bytes) of the code from the entry address of a routine.
- * (see hist_assign_samples for use and explanation.)
- */
-#define OFFSET_TO_CODE	0
-#define	UNITS_TO_CODE	(OFFSET_TO_CODE / sizeof(UNIT))
-
-/*
- * Minimum size of an instruction (in bytes):
- */
-#define MIN_INSN_SIZE	4
-
-#endif /* alpha_h */
diff --git a/gnu/usr.bin/binutils/gprof/cg_arcs.c b/gnu/usr.bin/binutils/gprof/cg_arcs.c
index 60bac99c100..07023170ded 100644
--- a/gnu/usr.bin/binutils/gprof/cg_arcs.c
+++ b/gnu/usr.bin/binutils/gprof/cg_arcs.c
@@ -84,6 +84,7 @@ DEFUN (arc_add, (parent, child, count),
       return;
     }
   arc = (Arc *) xmalloc (sizeof (*arc));
+  memset (arc, 0, sizeof (*arc));
   arc->parent = parent;
   arc->child = child;
   arc->count = count;
@@ -576,8 +577,7 @@ DEFUN_VOID (cg_assemble)
   Sym *parent, **time_sorted_syms, **top_sorted_syms;
   unsigned int index;
   Arc *arc;
-  extern void find_call PARAMS ((Sym * parent,
-				 bfd_vma p_lowpc, bfd_vma p_highpc));
+
   /*
    * initialize various things:
    *      zero out child times.
diff --git a/gnu/usr.bin/binutils/gprof/configure.bat b/gnu/usr.bin/binutils/gprof/configure.bat
deleted file mode 100644
index 22ef37eff88..00000000000
--- a/gnu/usr.bin/binutils/gprof/configure.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-@echo off

-echo Configuring gprof for go32

-rem This batch file assumes a unix-type "sed" program

-

-echo # Makefile generated by "configure.bat"> Makefile

-

-if exist config.sed del config.sed

-

-echo "/^###$/ i\				">>config.sed

-echo "MY_MACHINE=i386\				">>config.sed

-echo "CC=gcc					">>config.sed

-

-echo # >> config.sed

-

-sed -e "s/^\"//" -e "s/\"$//" -e "s/[ 	]*$//" config.sed > config2.sed

-sed -f config2.sed Makefile.in >> Makefile

-del config.sed

-del config2.sed

diff --git a/gnu/usr.bin/binutils/gprof/core.c b/gnu/usr.bin/binutils/gprof/core.c
deleted file mode 100644
index 3103dc281fc..00000000000
--- a/gnu/usr.bin/binutils/gprof/core.c
+++ /dev/null
@@ -1,665 +0,0 @@
-#include "libiberty.h"
-#include "gprof.h"
-#include "core.h"
-#include "symtab.h"
-
-#ifndef MIN_INSN_SIZE
-/* If not defined in MACHINE_H, assume smallest instruction is 1 byte
-   long.  THis is safe but may be needlessly slow on machines where
-   all instructions are longer.  */
-#define MIN_INSN_SIZE 1
-#endif
-
-bfd *core_bfd;
-int core_num_syms;
-asymbol **core_syms;
-asection *core_text_sect;
-PTR core_text_space;
-
-/* For mapping symbols to specific .o files during file ordering.  */
-struct function_map {
-  char *function_name;
-  char *file_name;
-};
-
-struct function_map *symbol_map;
-int symbol_map_count;
-
-static void
-DEFUN (read_function_mappings, (filename), const char *filename)
-{
-  FILE *file = fopen (filename, "r");
-  char dummy[1024];
-  int count = 0;
-
-  if (!file)
-    {
-      fprintf (stderr, "%s: could not open %s.\n", whoami, filename);
-      done (1);
-    }
-
-  /* First parse the mapping file so we know how big we need to
-     make our tables.  We also do some sanity checks at this
-     time.  */
-  while (!feof (file))
-    {
-      int matches;
-
-      matches = fscanf (file, "%[^\n:]", dummy);
-      if (!matches)
-	{
-	  fprintf (stderr, "%s: unable to parse mapping file %s.\n",
-		   whoami, filename);
-	  done (1);
-	}
-
-      /* Just skip messages about files with no symbols.  */
-      if (!strncmp (dummy, "No symbols in ", 14))
-	{
-	  fscanf (file, "\n");
-	  continue;
-	}
-
-      /* Don't care what else is on this line at this point.  */
-      fscanf (file, "%[^\n]\n", dummy);
-      count++;
-    }
-
-  /* Now we know how big we need to make our table.  */
-  symbol_map = ((struct function_map *)
-		xmalloc (count * sizeof (struct function_map)));
-
-  /* Rewind the input file so we can read it again.  */
-  rewind (file);
-
-  /* Read each entry and put it into the table.  */
-  count = 0;
-  while (!feof (file))
-    {
-      int matches;
-      char *tmp;
-
-      matches = fscanf (file, "%[^\n:]", dummy);
-      if (!matches)
-	{
-	  fprintf (stderr, "%s: unable to parse mapping file %s.\n",
-		   whoami, filename);
-	  done (1);
-	}
-
-      /* Just skip messages about files with no symbols.  */
-      if (!strncmp (dummy, "No symbols in ", 14))
-	{
-	  fscanf (file, "\n");
-	  continue;
-	}
-
-      /* dummy has the filename, go ahead and copy it.  */
-      symbol_map[count].file_name = xmalloc (strlen (dummy) + 1);
-      strcpy (symbol_map[count].file_name, dummy);
-
-      /* Now we need the function name.  */
-      fscanf (file, "%[^\n]\n", dummy);
-      tmp = strrchr (dummy, ' ') + 1;
-      symbol_map[count].function_name = xmalloc (strlen (tmp) + 1);
-      strcpy (symbol_map[count].function_name, tmp);
-      count++;
-    }
-
-  /* Record the size of the map table for future reference.  */
-  symbol_map_count = count;
-}
-
-void
-DEFUN (core_init, (a_out_name), const char *a_out_name)
-{
-  core_bfd = bfd_openr (a_out_name, 0);
-
-  if (!core_bfd)
-    {
-      perror (a_out_name);
-      done (1);
-    }
-
-  if (!bfd_check_format (core_bfd, bfd_object))
-    {
-      fprintf (stderr, "%s: %s: not in a.out format\n", whoami, a_out_name);
-      done (1);
-    }
-
-  /* get core's text section: */
-  core_text_sect = bfd_get_section_by_name (core_bfd, ".text");
-  if (!core_text_sect)
-    {
-      core_text_sect = bfd_get_section_by_name (core_bfd, "$CODE$");
-      if (!core_text_sect)
-	{
-	  fprintf (stderr, "%s: can't find .text section in %s\n",
-		   whoami, a_out_name);
-	  done (1);
-	}
-    }
-
-  /* read core's symbol table: */
-
-  /* this will probably give us more than we need, but that's ok:  */
-  core_num_syms = bfd_get_symtab_upper_bound (core_bfd);
-  if (core_num_syms < 0)
-    {
-      fprintf (stderr, "%s: %s: %s\n", whoami, a_out_name,
-	       bfd_errmsg (bfd_get_error ()));
-      done (1);
-    }
-
-  core_syms = (asymbol **) xmalloc (core_num_syms);
-  core_num_syms = bfd_canonicalize_symtab (core_bfd, core_syms);
-  if (core_num_syms < 0)
-    {
-      fprintf (stderr, "%s: %s: %s\n", whoami, a_out_name,
-	       bfd_errmsg (bfd_get_error ()));
-      done (1);
-    }
-
-  if (function_mapping_file)
-    read_function_mappings (function_mapping_file);
-}
-
-
-/*
- * Read in the text space of an a.out file
- */
-void
-DEFUN (core_get_text_space, (core_bfd), bfd * core_bfd)
-{
-  core_text_space = (PTR) malloc (core_text_sect->_raw_size);
-
-  if (!core_text_space)
-    {
-      fprintf (stderr, "%s: ran out room for %ld bytes of text space\n",
-	       whoami, core_text_sect->_raw_size);
-      done (1);
-    }
-  if (!bfd_get_section_contents (core_bfd, core_text_sect, core_text_space,
-				 0, core_text_sect->_raw_size))
-    {
-      bfd_perror ("bfd_get_section_contents");
-      free (core_text_space);
-      core_text_space = 0;
-    }
-  if (!core_text_space)
-    {
-      fprintf (stderr, "%s: can't do -c\n", whoami);
-    }
-}
-
-
-/*
- * Return class of symbol SYM.  The returned class can be any of:
- *      0   -> symbol is not interesting to us
- *      'T' -> symbol is a global name
- *      't' -> symbol is a local (static) name
- */
-static int
-DEFUN (core_sym_class, (sym), asymbol * sym)
-{
-  symbol_info syminfo;
-  const char *name;
-  char sym_prefix;
-  int i;
-
-  if (sym->section == NULL || (sym->flags & BSF_DEBUGGING) != 0)
-    {
-      return 0;
-    }
-
-  /*
-   * Must be a text symbol, and static text symbols don't qualify if
-   * ignore_static_funcs set.
-   */
-  if (ignore_static_funcs && (sym->flags & BSF_LOCAL))
-    {
-      DBG (AOUTDEBUG, printf ("[core_sym_class] %s: not a function\n",
-			      sym->name));
-      return 0;
-    }
-
-  bfd_get_symbol_info (core_bfd, sym, &syminfo);
-  i = syminfo.type;
-
-  if (i == 'T')
-    {
-      return i;			/* it's a global symbol */
-    }
-
-  if (i != 't')
-    {
-      /* not a static text symbol */
-      DBG (AOUTDEBUG, printf ("[core_sym_class] %s is of class %c\n",
-			      sym->name, i));
-      return 0;
-    }
-
-  /* do some more filtering on static function-names: */
-
-  if (ignore_static_funcs)
-    {
-      return 0;
-    }
-  /*
-   * Can't zero-length name or funny characters in name, where
-   * `funny' includes: `.' (.o file names) and `$' (Pascal labels).
-   */
-  if (!sym->name || sym->name[0] == '\0')
-    {
-      return 0;
-    }
-
-  for (name = sym->name; *name; ++name)
-    {
-      if (*name == '.' || *name == '$')
-	{
-	  return 0;
-	}
-    }
-  /*
-   * On systems where the C compiler adds an underscore to all
-   * names, static names without underscores seem usually to be
-   * labels in hand written assembler in the library.  We don't want
-   * these names.  This is certainly necessary on a Sparc running
-   * SunOS 4.1 (try profiling a program that does a lot of
-   * division). I don't know whether it has harmful side effects on
-   * other systems.  Perhaps it should be made configurable.
-   */
-  sym_prefix = bfd_get_symbol_leading_char (core_bfd);
-  if ((sym_prefix && sym_prefix != sym->name[0])
-  /*
-   * GCC may add special symbols to help gdb figure out the file
-   * language.  We want to ignore these, since sometimes they mask
-   * the real function.  (dj@ctron)
-   */
-      || !strncmp (sym->name, "__gnu_compiled", 14)
-      || !strncmp (sym->name, "___gnu_compiled", 15))
-    {
-      return 0;
-    }
-
-  /* If the object file supports marking of function symbols, then we can
-     zap anything that doesn't have BSF_FUNCTION set.  */
-  if (ignore_non_functions && (sym->flags & BSF_FUNCTION) == 0)
-    return 0;
-
-  return 't';			/* it's a static text symbol */
-}
-
-
-/*
- * 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)
-{
-  const char *fname = 0, *func_name = 0;
-  int l = 0;
-
-  if (bfd_find_nearest_line (core_bfd, core_text_sect, core_syms,
-			     addr - core_text_sect->vma,
-			     &fname, &func_name, (unsigned int *) &l)
-      && fname && func_name && l)
-    {
-      DBG (AOUTDEBUG, printf ("[get_src_info] 0x%lx -> %s:%d (%s)\n",
-			      addr, fname, l, func_name));
-      *filename = fname;
-      *name = func_name;
-      *line_num = l;
-      return TRUE;
-    }
-  else
-    {
-      DBG (AOUTDEBUG, printf ("[get_src_info] no info for 0x%lx (%s:%d,%s)\n",
-			      (long) addr, fname ? fname : "<unknown>", l,
-			      func_name ? func_name : "<unknown>"));
-      return FALSE;
-    }
-}
-
-
-/*
- * Read in symbol table from core.  One symbol per function is
- * entered.
- */
-void
-DEFUN (core_create_function_syms, (core_bfd), bfd * core_bfd)
-{
-  bfd_vma min_vma = ~0, max_vma = 0;
-  int class;
-  long i, j, found, skip;
-
-  /* pass 1 - determine upper bound on number of function names: */
-  symtab.len = 0;
-  for (i = 0; i < core_num_syms; ++i)
-    {
-      if (!core_sym_class (core_syms[i]))
-	{
-	  continue;
-	}
-
-      /* This should be replaced with a binary search or hashed
-	 search.  Gross. 
-
-	 Don't create a symtab entry for a function that has
-	 a mapping to a file, unless it's the first function
-	 in the file.  */
-      skip = 0;
-      for (j = 0; j < symbol_map_count; j++)
-	if (!strcmp (core_syms[i]->name, symbol_map[j].function_name))
-	  {
-	    if (j > 0 && ! strcmp (symbol_map [j].file_name,
-			 	   symbol_map [j - 1].file_name))
-	      skip = 1;
-	    break;
-	  }
-      if (!skip)
-        ++symtab.len;
-    }
-
-  if (symtab.len == 0)
-    {
-      fprintf (stderr, "%s: file `%s' has no symbols\n", whoami, a_out_name);
-      done (1);
-    }
-
-  /* the "+ 2" is for the sentinels: */
-  symtab.base = (Sym *) xmalloc ((symtab.len + 2) * sizeof (Sym));
-
-  /* pass 2 - create symbols: */
-
-  symtab.limit = symtab.base;
-  for (i = 0; i < core_num_syms; ++i)
-    {
-      class = core_sym_class (core_syms[i]);
-      if (!class)
-	{
-	  DBG (AOUTDEBUG,
-	       printf ("[core_create_function_syms] rejecting: 0x%lx %s\n",
-		       core_syms[i]->value, core_syms[i]->name));
-	  continue;
-	}
-      /* This should be replaced with a binary search or hashed
-	 search.  Gross.   */
-
-      skip = 0;
-      found = 0;
-      for (j = 0; j < symbol_map_count; j++)
-	if (!strcmp (core_syms[i]->name, symbol_map[j].function_name))
-	  {
-	    if (j > 0 && ! strcmp (symbol_map [j].file_name,
-			 	   symbol_map [j - 1].file_name))
-	      skip = 1;
-	    else
-	      found = j;
-	    break;
-	  }
-
-      if (skip)
-	continue;
-
-      sym_init (symtab.limit);
-
-      /* symbol offsets are always section-relative: */
-
-      symtab.limit->addr = core_syms[i]->value + core_syms[i]->section->vma;
-      if (symbol_map_count
-	  && !strcmp (core_syms[i]->name, symbol_map[found].function_name))
-	{
-	  symtab.limit->name = symbol_map[found].file_name;
-	  symtab.limit->mapped = 1;
-	}
-      else
-	{
-	  symtab.limit->name = core_syms[i]->name;
-	  symtab.limit->mapped = 0;
-	}
-
-#ifdef __osf__
-      /*
-       * Suppress symbols that are not function names.  This is
-       * useful to suppress code-labels and aliases.
-       *
-       * This is known to be useful under DEC's OSF/1.  Under SunOS 4.x,
-       * labels do not appear in the symbol table info, so this isn't
-       * necessary.
-       */
-      {
-	const char *filename, *func_name;
-	
-	if (get_src_info (symtab.limit->addr, &filename, &func_name,
-			  &symtab.limit->line_num))
-	  {
-	    symtab.limit->file = source_file_lookup_path (filename);
-
-	    if (strcmp (symtab.limit->name, func_name) != 0)
-	      {
-		/*
-		 * The symbol's address maps to a different name, so
-		 * it can't be a function-entry point.  This happens
-		 * for labels, for example.
-		 */
-		DBG (AOUTDEBUG,
-		     printf ("[core_create_function_syms: rej %s (maps to %s)\n",
-			     symtab.limit->name, func_name));
-		continue;
-	      }
-	  }
-      }
-#endif
-
-      symtab.limit->is_func = TRUE;
-      symtab.limit->is_bb_head = TRUE;
-      if (class == 't')
-	{
-	  symtab.limit->is_static = TRUE;
-	}
-
-      min_vma = MIN (symtab.limit->addr, min_vma);
-      max_vma = MAX (symtab.limit->addr, max_vma);
-
-      /*
-       * If we see "main" without an initial '_', we assume names
-       * are *not* prefixed by '_'.
-       */
-      if (symtab.limit->name[0] == 'm' && discard_underscores
-	  && strcmp (symtab.limit->name, "main") == 0)
-	{
-	  discard_underscores = 0;
-	}
-
-      DBG (AOUTDEBUG, printf ("[core_create_function_syms] %ld %s 0x%lx\n",
-			      (long) (symtab.limit - symtab.base),
-			      symtab.limit->name, symtab.limit->addr));
-      ++symtab.limit;
-    }
-
-  /* create sentinels: */
-
-  sym_init (symtab.limit);
-  symtab.limit->name = "<locore>";
-  symtab.limit->addr = 0;
-  symtab.limit->end_addr = min_vma - 1;
-  ++symtab.limit;
-
-  sym_init (symtab.limit);
-  symtab.limit->name = "<hicore>";
-  symtab.limit->addr = max_vma + 1;
-  symtab.limit->end_addr = ~0;
-  ++symtab.limit;
-
-  symtab.len = symtab.limit - symtab.base;
-  symtab_finalize (&symtab);
-}
-
-
-/*
- * Read in symbol table from core.  One symbol per line of source code
- * is entered.
- */
-void
-DEFUN (core_create_line_syms, (core_bfd), bfd * core_bfd)
-{
-  char prev_name[PATH_MAX], prev_filename[PATH_MAX];
-  bfd_vma vma, min_vma = ~0, max_vma = 0;
-  bfd_vma offset, prev_offset, min_dist;
-  Sym *prev, dummy, *sentinel, *sym;
-  const char *filename;
-  int prev_line_num, i;
-  Sym_Table ltab;
-  /*
-   * Create symbols for functions as usual.  This is necessary in
-   * 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);
-
-  /* pass 1 - counter number of symbols: */
-
-  /*
-   * To find all line information, walk through all possible
-   * text-space addresses (one by one!) and get the debugging
-   * info for each address.  When the debugging info changes,
-   * it is time to create a new symbol.
-   *
-   * Of course, this is rather slow and it would be better if
-   * bfd would provide an iterator for enumerating all line
-   * infos, but for now, we try to speed up the second pass
-   * by determining what the minimum code distance between two
-   * lines is.
-   */
-  prev_name[0] = '\0';
-  ltab.len = 0;
-  min_dist = core_text_sect->_raw_size;
-  prev_offset = -min_dist;
-  prev_filename[0] = '\0';
-  prev_line_num = 0;
-  for (offset = 0; offset < core_text_sect->_raw_size; offset += MIN_INSN_SIZE)
-    {
-      vma = core_text_sect->vma + offset;
-      if (!get_src_info (vma, &filename, &dummy.name, &dummy.line_num)
-	  || (prev_line_num == dummy.line_num &&
-	      strcmp (prev_name, dummy.name) == 0
-	      && strcmp (prev_filename, filename) == 0))
-	{
-	  continue;
-	}
-
-      ++ltab.len;
-      prev_line_num = dummy.line_num;
-      strcpy (prev_name, dummy.name);
-      strcpy (prev_filename, filename);
-
-      if (offset - prev_offset < min_dist)
-	{
-	  min_dist = offset - prev_offset;
-	}
-      prev_offset = offset;
-
-      min_vma = MIN (vma, min_vma);
-      max_vma = MAX (vma, max_vma);
-    }
-
-  DBG (AOUTDEBUG, printf ("[core_create_line_syms] min_dist=%lx\n", min_dist));
-
-  /* make room for function symbols, too: */
-  ltab.len += symtab.len;
-  ltab.base = (Sym *) xmalloc (ltab.len * sizeof (Sym));
-  ltab.limit = ltab.base;
-
-  /* pass 2 - create symbols: */
-
-  prev = 0;
-  for (offset = 0; offset < core_text_sect->_raw_size; offset += min_dist)
-    {
-      sym_init (ltab.limit);
-      if (!get_src_info (core_text_sect->vma + offset, &filename,
-			 &ltab.limit->name, &ltab.limit->line_num)
-	  || (prev && prev->line_num == ltab.limit->line_num
-	      && strcmp (prev->name, ltab.limit->name) == 0
-	      && strcmp (prev->file->name, filename) == 0))
-	{
-	  continue;
-	}
-
-      /* make name pointer a malloc'ed string: */
-      ltab.limit->name = xstrdup (ltab.limit->name);
-      ltab.limit->file = source_file_lookup_path (filename);
-
-      ltab.limit->addr = core_text_sect->vma + offset;
-      prev = ltab.limit;
-
-      /*
-       * If we see "main" without an initial '_', we assume names
-       * are *not* prefixed by '_'.
-       */
-      if (ltab.limit->name[0] == 'm' && discard_underscores
-	  && strcmp (ltab.limit->name, "main") == 0)
-	{
-	  discard_underscores = 0;
-	}
-
-      DBG (AOUTDEBUG, printf ("[core_create_line_syms] %d %s 0x%lx\n",
-			      ltab.len, ltab.limit->name,
-			      ltab.limit->addr));
-      ++ltab.limit;
-    }
-
-  /* update sentinels: */
-
-  sentinel = sym_lookup (&symtab, 0);
-  if (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->addr = max_vma + 1;
-    }
-
-  /* copy in function symbols: */
-  memcpy (ltab.limit, symtab.base, symtab.len * sizeof (Sym));
-  ltab.limit += symtab.len;
-
-  if (ltab.limit - ltab.base != ltab.len)
-    {
-      fprintf (stderr,
-	       "%s: somebody miscounted: ltab.len=%ld instead of %d\n",
-	       whoami, (long) (ltab.limit - ltab.base), ltab.len);
-      done (1);
-    }
-
-  /* finalize ltab and make it symbol table: */
-
-  symtab_finalize (&ltab);
-  free (symtab.base);
-  symtab = ltab;
-
-  /* now go through all core symbols and set is_static accordingly: */
-
-  for (i = 0; i < core_num_syms; ++i)
-    {
-      if (core_sym_class (core_syms[i]) == 't')
-	{
-	  sym = sym_lookup (&symtab, core_syms[i]->value
-			    + core_syms[i]->section->vma);
-	  do
-	    {
-	      sym++->is_static = TRUE;
-	    }
-	  while (sym->file == sym[-1].file &&
-		 strcmp (sym->name, sym[-1].name) == 0);
-	}
-    }
-
-}
diff --git a/gnu/usr.bin/binutils/gprof/core.h b/gnu/usr.bin/binutils/gprof/core.h
deleted file mode 100644
index 81c79ad4559..00000000000
--- a/gnu/usr.bin/binutils/gprof/core.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef core_h
-#define core_h
-
-#include "bfd.h"
-
-extern bfd *core_bfd;		/* bfd for core-file */
-extern int core_num_syms;	/* # of entries in symbol-table */
-extern asymbol **core_syms;	/* symbol table in a.out */
-extern asection *core_text_sect;	/* core text section */
-extern PTR core_text_space;	/* text space of a.out in core */
-
-extern void core_init PARAMS ((const char *a_out_name));
-extern void core_get_text_space PARAMS ((bfd * core_bfd));
-extern void core_create_function_syms PARAMS ((bfd * core_bfd));
-extern void core_create_line_syms PARAMS ((bfd * core_bfd));
-
-#endif /* core_h */
diff --git a/gnu/usr.bin/binutils/gprof/dummy.c b/gnu/usr.bin/binutils/gprof/dummy.c
deleted file mode 100644
index ca602dfa887..00000000000
--- a/gnu/usr.bin/binutils/gprof/dummy.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "gprof.h"
-#include "symtab.h"
-
-
-/*
- * dummy.c -- This file should be used for an unsupported processor type.
- * It does nothing, but prevents findcall() from being unresolved.
- */
-
-void
-DEFUN (find_call, (parent, p_lowpc, p_highpc),
-       Sym * parent AND bfd_vma p_lowpc AND bfd_vma p_highpc)
-{
-  fprintf (stderr, "%s: -c not supported on this machine architecture\n",
-	   whoami);
-}
diff --git a/gnu/usr.bin/binutils/gprof/dummy.h b/gnu/usr.bin/binutils/gprof/dummy.h
deleted file mode 100644
index 4c37c15f072..00000000000
--- a/gnu/usr.bin/binutils/gprof/dummy.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * 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. 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
- *    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.
- *
- *	@(#)dummy.h	5.1 (Berkeley) 4/18/91
- */
-#ifndef dummy_h
-#define dummy_h
-
-/*
- * dummy.h -- This file should be used when a processor is not yet supported.
- */
-
-/*
- * Offset (in bytes) of the code from the entry address of a routine.
- * (see hist_assign_samples()) for use and explanation.)
- */
-#define OFFSET_TO_CODE	0
-#define	UNITS_TO_CODE	(OFFSET_TO_CODE / sizeof(UNIT))
-
-enum opermodes
-  {
-    dummy
-  };
-typedef enum opermodes operandenum;
-
-#endif /* dummy_h */
diff --git a/gnu/usr.bin/binutils/gprof/i386.h b/gnu/usr.bin/binutils/gprof/i386.h
deleted file mode 100644
index f85f55cbbd9..00000000000
--- a/gnu/usr.bin/binutils/gprof/i386.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 1983 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.
- *
- *      @(#)tahoe.h     1.4 (Berkeley) 6/1/90
- */
-
-/*
- * Right now, this does very little
- */
-
-    /*
-     *        opcode of the `callf' instruction
-     */
-    /*
-     *        offset (in bytes) of the code from the entry address of a routine.
-     *  (see asgnsamples for use and explanation.)
-     */
-#define OFFSET_TO_CODE	0
-#define	UNITS_TO_CODE	(OFFSET_TO_CODE / sizeof(UNIT))
-
-#ifdef __MSDOS__
-#define FOPEN_RB "rb"
-#endif
diff --git a/gnu/usr.bin/binutils/gprof/ns532.c b/gnu/usr.bin/binutils/gprof/ns532.c
deleted file mode 100644
index c68fae4473c..00000000000
--- a/gnu/usr.bin/binutils/gprof/ns532.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "gprof.h"
-#include "symtab.h"
-
-/*
- * dummy.c -- This file should be used for an unsupported processor type.
- * It does nothing, but prevents findcall() from being unresolved.
- */
-
-void
-find_call (parent, p_lowpc, p_highpc)
-     Sym *parent;
-     bfd_vma p_lowpc;
-     bfd_vma p_highpc;
-{
-  fprintf (stderr, "%s: -c supported on this machine architecture\n",
-	   whoami);
-}
diff --git a/gnu/usr.bin/binutils/gprof/ns532.h b/gnu/usr.bin/binutils/gprof/ns532.h
deleted file mode 100644
index 2fa22334e03..00000000000
--- a/gnu/usr.bin/binutils/gprof/ns532.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * 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. 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
- *    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.
- *
- *	@(#)dummy.h	5.1 (Berkeley) 4/18/91
- */
-
-/*
- *        offset (in bytes) of the code from the entry address of a routine.
- *  (see asgnsamples for use and explanation.)
- */
-#ifdef MACH
-#include <machine/mach_param.h>
-#define hertz() (HZ)
-#endif
-#define OFFSET_OF_CODE	0
-#define	UNITS_TO_CODE	(OFFSET_OF_CODE / sizeof(UNIT))
-
-enum opermodes
-  {
-    dummy
-  };
-typedef enum opermodes operandenum;
diff --git a/gnu/usr.bin/binutils/gprof/sparc.h b/gnu/usr.bin/binutils/gprof/sparc.h
deleted file mode 100644
index 48e5d230aa7..00000000000
--- a/gnu/usr.bin/binutils/gprof/sparc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 1983 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.
- *
- *      @(#)tahoe.h     1.4 (Berkeley) 6/1/90
- */
-
-    /*
-     *        opcode of the `callf' instruction
-     */
-#define	CALL	(0xc0000000)
-    /*
-     *        offset (in bytes) of the code from the entry address of a routine.
-     *  (see asgnsamples for use and explanation.)
-     */
-#define OFFSET_TO_CODE	0
-#define	UNITS_TO_CODE	(OFFSET_TO_CODE / sizeof(UNIT))
diff --git a/gnu/usr.bin/binutils/gprof/symtab.h b/gnu/usr.bin/binutils/gprof/symtab.h
index 66f97a4e230..a6a450ef1ee 100644
--- a/gnu/usr.bin/binutils/gprof/symtab.h
+++ b/gnu/usr.bin/binutils/gprof/symtab.h
@@ -106,4 +106,6 @@ extern void sym_init PARAMS ((Sym * sym));
 extern void symtab_finalize PARAMS ((Sym_Table * symtab));
 extern Sym *sym_lookup PARAMS ((Sym_Table * symtab, bfd_vma address));
 
+extern void find_call PARAMS ((Sym *, bfd_vma, bfd_vma));
+
 #endif /* symtab_h */
diff --git a/gnu/usr.bin/binutils/gprof/tahoe.h b/gnu/usr.bin/binutils/gprof/tahoe.h
deleted file mode 100644
index 4d153a44f54..00000000000
--- a/gnu/usr.bin/binutils/gprof/tahoe.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1983 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.
- *
- *      @(#)tahoe.h     1.4 (Berkeley) 6/1/90
- */
-
-    /*
-     *        opcode of the `callf' instruction
-     */
-#define	CALLF	0xfe
-
-    /*
-     *        offset (in bytes) of the code from the entry address of a routine.
-     *  (see asgnsamples for use and explanation.)
-     */
-#define OFFSET_TO_CODE	2
-#define	UNITS_TO_CODE	(OFFSET_TO_CODE / sizeof(UNIT))
-
-    /*
-     *        register for pc relative addressing
-     */
-#define	PC	0xf
-
-enum opermodes
-  {
-    literal, indexed, reg, regdef, autodec, autoinc, autoincdef,
-    bytedisp, bytedispdef, worddisp, worddispdef, longdisp, longdispdef,
-    immediate, absolute, byterel, bytereldef, wordrel, wordreldef,
-    longrel, longreldef
-  };
-typedef enum opermodes operandenum;
diff --git a/gnu/usr.bin/binutils/gprof/vax.h b/gnu/usr.bin/binutils/gprof/vax.h
deleted file mode 100644
index 69ec9c26ee9..00000000000
--- a/gnu/usr.bin/binutils/gprof/vax.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1983 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.
- *
- *      @(#)vax.h       5.4 (Berkeley) 6/1/90
- */
-
-    /*
-     *        opcode of the `calls' instruction
-     */
-#define	CALLS	0xfb
-
-    /*
-     *        offset (in bytes) of the code from the entry address of a routine.
-     *  (see asgnsamples for use and explanation.)
-     */
-#define OFFSET_TO_CODE	2
-#define	UNITS_TO_CODE	(OFFSET_TO_CODE / sizeof(UNIT))
-
-    /*
-     *        register for pc relative addressing
-     */
-#define	PC	0xf
-
-enum opermodes
-  {
-    literal, indexed, reg, regdef, autodec, autoinc, autoincdef,
-    bytedisp, bytedispdef, worddisp, worddispdef, longdisp, longdispdef,
-    immediate, absolute, byterel, bytereldef, wordrel, wordreldef,
-    longrel, longreldef
-  };
-typedef enum opermodes operandenum;
-
-struct modebyte
-  {
-    unsigned int regfield:4;
-    unsigned int modefield:4;
-  };