David Mosberger's fixes for cross compiling gprof.

[deliverable/binutils-gdb.git] / gprof / gmon.h

diff --git a/gprof/gmon.h b/gprof/gmon.h
index 541fa4dbdf991748cff380c02fa320a06e32cb14..28a54bcbaf2bad12285c981f39448de445940a96 100644 (file)
--- a/gprof/gmon.h
+++ b/gprof/gmon.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1991 The Regents of the University of California.
+ * Copyright (c) 1991, 2001 The Regents of the University of California.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,13 +39,8 @@ struct raw_phdr
   {
     /* FIXME: Checking a host compiler define means that we can't use
        a cross gprof to the alpha.  */
-#ifdef __alpha__
-    char low_pc[8];            /* base pc address of sample buffer */
-    char high_pc[8];           /* max pc address of sampled buffer */
-#else
-    char low_pc[4];            /* base pc address of sample buffer */
-    char high_pc[4];           /* max pc address of sampled buffer */
-#endif
+    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) */
 
     char version[4];           /* version number */
@@ -57,15 +52,8 @@ struct raw_phdr
 
 struct old_raw_phdr
   {
-    /* FIXME: Checking a host compiler define means that we can't use
-       a cross gprof to the alpha.  */
-#ifdef __alpha__
-    char low_pc[8];            /* base pc address of sample buffer */
-    char high_pc[8];           /* max pc address of sampled buffer */
-#else
-    char low_pc[4];            /* base pc address of sample buffer */
-    char high_pc[4];           /* max pc address of sampled buffer */
-#endif
+    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) */
 
     /* FIXME: Checking host compiler defines here means that we can't
@@ -103,7 +91,7 @@ struct old_raw_phdr
  *      calls   $0,(r0)
  *      calls   $0,(r0)
  *
- * which is separated by only three bytes, thus HASHFRACTION is 
+ * which is separated by only three bytes, thus HASHFRACTION is
  * calculated as:
  *
  *      HASHFRACTION = 3 / (2 * 2 - 1) = 1
@@ -134,17 +122,9 @@ struct tostruct
  */
 struct raw_arc
   {
-    /* FIXME: Checking a host compiler define means that we can't use
-       a cross gprof to the alpha.  */
-#ifdef __alpha__
-    char from_pc[8];
-    char self_pc[8];
-    char count[8];
-#else
-    char from_pc[4];
-    char self_pc[4];
+    char from_pc[GMON_PTR_SIZE];
+    char self_pc[GMON_PTR_SIZE];
     char count[4];
-#endif
   };
 
 /*