* configure.in: Define BSD44_FORMAT if the target looks like a

	BSD4.4 derived system.
	* configure: Rebuild.
	* Makefile.in (.c.o): Add @DEFS@.
	* gmon_io.c (gmon_out_read): In BSD44_FORMAT code, get profrate
	from profrate field, not version field.

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index a8add32edc80c5dd5038029504483b1e9c1f3b36..ab53b47384bf92f829d0a99664b8a8edc4788eb0 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,12 @@
+Thu Feb 27 12:46:53 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+       * configure.in: Define BSD44_FORMAT if the target looks like a
+       BSD4.4 derived system.
+       * configure: Rebuild.
+       * Makefile.in (.c.o): Add @DEFS@.
+       * gmon_io.c (gmon_out_read): In BSD44_FORMAT code, get profrate
+       from profrate field, not version field.
+
 Thu Jan 16 17:42:54 1997  Ian Lance Taylor  <ian@cygnus.com>
 
        * dummy.c (find_call): Clear ignore_direct_calls.

diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 2b4402ef883871eda05fa35b47371c174dbe1086..db3f0f0af8e92be35f56d23d9b16b9638771e1ad 100644 (file)
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -56,7 +56,7 @@ LDFLAGS=
 HLDFLAGS = @HLDFLAGS@
 HLDENV = @HLDENV@
 .c.o:
-       $(CC) -c -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -DMACHINE_H=\"$(MY_TARGET).h\" $(TCFLAGS) $(HCFLAGS) $(CFLAGS) $<
+       $(CC) -c -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd @DEFS@ -DMACHINE_H=\"$(MY_TARGET).h\" $(TCFLAGS) $(HCFLAGS) $(CFLAGS) $<
 
 all:   $(GEN_FILES) $(PROG)
 

diff --git a/gprof/configure b/gprof/configure
index 7799ca8d87f319366e45a4a4fb75b51b2485f526..cf951d9d9f84a9edd6e344844d66a5ba56d4b2ae 100755 (executable)
--- a/gprof/configure
+++ b/gprof/configure
@@ -925,6 +925,15 @@ esac
 
 
 
+case "${target}" in
+*-*-bsd4.4* | *-*-netbsd* | *-*-freebsd* | *-*-openbsd*)
+  cat >> confdefs.h <<\EOF
+#define BSD44_FORMAT 1
+EOF
+
+  ;;
+esac
+
 BFDLIB='-L../bfd -lbfd'
 
 # We need to handle some special cases if BFD was built shared.

diff --git a/gprof/configure.in b/gprof/configure.in
index 074ace72661e31d0f34647ec1b7bc2d62df37085..30bb9b237e8fbbbb8c5947a177c5f3ae870414bb 100644 (file)
--- a/gprof/configure.in
+++ b/gprof/configure.in
@@ -33,6 +33,15 @@ esac
 
 AC_SUBST(MY_TARGET)
 
+dnl We need to set BSD44_FORMAT on a host which uses the additional
+dnl header fields.  This is an attempt to do that.  I can't think of a
+dnl good feature test for this.
+case "${target}" in
+*-*-bsd4.4* | *-*-netbsd* | *-*-freebsd* | *-*-openbsd*)
+  AC_DEFINE(BSD44_FORMAT)
+  ;;
+esac
+
 BFDLIB='-L../bfd -lbfd'
 
 # We need to handle some special cases if BFD was built shared.

diff --git a/gprof/gmon_io.c b/gprof/gmon_io.c
index 1f0e1acbf24eaffa98b1853b0dc29559a08aa763..d66b969281ac98c41cd726bdcc67b8e3a8b6cfee 100644 (file)
--- a/gprof/gmon_io.c
+++ b/gprof/gmon_io.c
@@ -188,7 +188,7 @@ DEFUN (gmon_out_read, (filename), const char *filename)
       {
        int profrate;
 
-       profrate = bfd_get_32 (core_bfd, (bfd_byte *) &raw.version[0]);
+       profrate = bfd_get_32 (core_bfd, (bfd_byte *) &raw.profrate[0]);
        if (!s_highpc)
          hz = profrate;
        else if (hz != profrate)