aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/bitmap.c2
-rw-r--r--gcc/statistics.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef1dc84..886f840 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-24 Jason Merrill <jason@redhat.com>
+
+ * bitmap.c (bitmap_descriptor): Adjust order of parameters to
+ match MEM_STAT_DECL.
+ * statistics.h (ALONE_FINAL_MEM_STAT_DECL): Correct typo.
+
2012-07-24 Richard Henderson <rth@redhat.com>
* optabs.h (struct optab_d): Rename code member to code_.
diff --git a/gcc/bitmap.c b/gcc/bitmap.c
index 2b77967..4ac129f 100644
--- a/gcc/bitmap.c
+++ b/gcc/bitmap.c
@@ -68,7 +68,7 @@ eq_descriptor (const void *p1, const void *p2)
/* For given file and line, return descriptor, create new if needed. */
static struct bitmap_descriptor *
-bitmap_descriptor (const char *file, const char *function, int line)
+bitmap_descriptor (const char *file, int line, const char *function)
{
struct bitmap_descriptor **slot;
struct loc loc;
diff --git a/gcc/statistics.h b/gcc/statistics.h
index 60fd68a..8ec0a99 100644
--- a/gcc/statistics.h
+++ b/gcc/statistics.h
@@ -29,7 +29,7 @@
#define GCC_MEM_STAT_ARGUMENTS const char * ARG_UNUSED (_loc_name), int ARG_UNUSED (_loc_line), const char * ARG_UNUSED (_loc_function)
#if GATHER_STATISTICS
#define ALONE_MEM_STAT_DECL GCC_MEM_STAT_ARGUMENTS
-#define ALONE_FINAL_MEM_STAT_DECL ALONE_MEM_STAT_INFO
+#define ALONE_FINAL_MEM_STAT_DECL ALONE_MEM_STAT_DECL
#define ALONE_PASS_MEM_STAT _loc_name, _loc_line, _loc_function
#define ALONE_FINAL_PASS_MEM_STAT ALONE_PASS_MEM_STAT
#define ALONE_MEM_STAT_INFO __FILE__, __LINE__, __FUNCTION__