More cleanups for gprof, especially with the '386 target.

diff --git a/gprof/gprof.c b/gprof/gprof.c
index b2c5e33f0b6eaf88acfecb4887b411c75e680a88..ce4c4e0f338cbf893dd4b197d89874bc56ea9112 100644 (file)
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -230,7 +230,7 @@ bfd *abfd;
     i = get_symtab_upper_bound (abfd); /* This will probably give us more
                                         * than we need, but that's ok.
                                         */
-    syms = malloc (i);
+    syms = (asymbol**)malloc (i);
     nosyms = bfd_canonicalize_symtab (abfd, syms);
 
     nname = 0;
@@ -355,8 +355,8 @@ openpfile(filename)
        done();
     }
     fread(&tmp, sizeof(struct hdr), 1, pfile);
-    tmp.lowpc = bfd_get_32 (abfd, &tmp.lowpc);
-    tmp.highpc = bfd_get_32 (abfd, &tmp.highpc);
+    tmp.lowpc = (char*)bfd_get_32 (abfd, &tmp.lowpc);
+    tmp.highpc = (char*)bfd_get_32 (abfd, &tmp.highpc);
     tmp.ncnt = bfd_get_32 (abfd, &tmp.ncnt);
 
     if ( s_highpc != 0 && ( tmp.lowpc != h.lowpc ||

diff --git a/gprof/i386.c b/gprof/i386.c
index dc28611b30803e284a6e976db63f675852c7f3a5..50e99803efac490316c230fff0cc7cc6dbedc499 100644 (file)
--- a/gprof/i386.c
+++ b/gprof/i386.c
@@ -47,8 +47,14 @@ nltype       indirectchild = {
        (arctype *) 0                   /* list of callee arcs */
     };
 
+#ifdef __STDC__
 int
-iscall (unsigned char *ip) {
+iscall (unsigned char *ip)
+#else
+int iscall(ip)
+       unsigned char *ip;
+#endif /* __STDC__ */
+{
   if (*ip == 0xeb || *ip == 0x9a) 
     return 1;
   return 0;