Mon Sep 25 22:49:32 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>

* Makefile.in: Add dependecies for $(OBJS) on header files.

* cg_print.c (print_cycle, print_members, cg_print_index): Fix new style output
format to make it consistent.
* dummy.c (find_call): Fix typo in error message.

4 files changed, 39 insertions, 7 deletions

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index a8970265ef..9555f13b70 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,13 @@
+Fri Oct  6 16:25:32 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	Mon Sep 25 22:49:32 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* Makefile.in: Add dependecies for $(OBJS) on header files.
+
+	* cg_print.c (print_cycle, print_members, cg_print_index): Fix new
+	style output format to make it consistent.
+	* dummy.c (find_call): Fix typo in error message.
+
 Wed Sep 20 13:21:02 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* Makefile.in (maintainer-clean): New target, synonym for
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index bc0fb19d88..6f34a19e78 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -117,6 +117,11 @@ Makefile: Makefile.in config.status
 config.status: configure
 	$(SHELL) config.status --recheck
 
+$(OBJS): ../bfd/bfd.h call_graph.h cg_arcs.h cg_print.h core.h gmon_io.h \
+	 gmon_out.h gprof.h hertz.h hist.h search_list.h source.h sym_ids.h \
+	 symtab.h utils.h $(srcdir)/../include/libiberty.h \
+	 $(srcdir)/../bfd/sysdep.h $(MY_TARGET).h
+
 # These get around a bug in Sun Make in SunOS 4.1.1 and Solaris 2
 $(MY_TARGET).o: $(MY_TARGET).c
 basic_blocks.o: basic_blocks.c
diff --git a/gprof/cg_print.c b/gprof/cg_print.c
index d83fbb73fe..460bc045c4 100644
--- a/gprof/cg_print.c
+++ b/gprof/cg_print.c
@@ -82,7 +82,9 @@ DEFUN (print_cycle, (cyc), Sym * cyc)
   char buf[BUFSIZ];
 
   sprintf (buf, "[%d]", cyc->cg.index);
-  printf ("%-6.6s %5.1f %7.2f %11.2f %7d", buf,
+  printf (bsd_style_output
+	  ? "%-6.6s %5.1f %7.2f %11.2f %7d"
+	  : "%-6.6s %5.1f %7.2f %7.2f %7d", buf,
 	  100 * (cyc->cg.prop.self + cyc->cg.prop.child) / print_time,
 	  cyc->cg.prop.self / hz, cyc->cg.prop.child / hz, cyc->ncalls);
   if (cyc->cg.self_calls != 0)
@@ -93,7 +95,7 @@ DEFUN (print_cycle, (cyc), Sym * cyc)
     {
       printf (" %7.7s", "");
     }
-  printf (" <cycle %d as a whole>\t[%d]\n", cyc->cg.cyc.num, cyc->cg.index);
+  printf (" <cycle %d as a whole> [%d]\n", cyc->cg.cyc.num, cyc->cg.index);
 }
 
 
@@ -170,7 +172,9 @@ DEFUN (print_members, (cyc), Sym * cyc)
   sort_members (cyc);
   for (member = cyc->cg.cyc.next; member; member = member->cg.cyc.next)
     {
-      printf ("%6.6s %5.5s %7.2f %11.2f %7d",
+      printf (bsd_style_output
+	      ? "%6.6s %5.5s %7.2f %11.2f %7d"
+	      : "%6.6s %5.5s %7.2f %7.2f %7d",
 	      "", "", member->cg.prop.self / hz, member->cg.prop.child / hz,
 	      member->ncalls);
       if (member->cg.self_calls != 0)
@@ -627,9 +631,22 @@ DEFUN_VOID (cg_print_index)
 	    }
 	  else
 	    {
-	      printf ("%6.6s ", buf);
-	      sprintf (buf, "<cycle %d>", sym->cg.cyc.num);
-	      printf ("%-19.19s", buf);
+	      if (bsd_style_output)
+		{
+		  printf ("%6.6s ", buf);
+		  sprintf (buf, "<cycle %d>", sym->cg.cyc.num);
+		  printf ("%-19.19s", buf);
+		}
+	      else
+		{
+		  col += strlen (buf);
+		  for (; col < starting_col + 5; ++col)
+		    putchar (' ');
+		  printf (" %s ", buf);
+		  sprintf (buf, "<cycle %d>", sym->cg.cyc.num);
+		  printf ("%s", buf);
+		  col += strlen (buf);
+		}
 	    }
 	  starting_col += column_width;
 	}
diff --git a/gprof/dummy.c b/gprof/dummy.c
index db7d7496ad..ca602dfa88 100644
--- a/gprof/dummy.c
+++ b/gprof/dummy.c
@@ -11,6 +11,6 @@ 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 supported on this machine architecture\n",
+  fprintf (stderr, "%s: -c not supported on this machine architecture\n",
 	   whoami);
 }