diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2697a7fd189..6e8a60fc0c4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-24  Ben Elliston  <bje@au.ibm.com>
+
+	* bitmap.h (BITMAP_FREE): Eliminate `implicit conversion from
+	void *' warning from -Wc++-compat.
+	* Makefile.in (dominance.o-warn): Remove.
+
 2008-01-23  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR tree-optimization/38932
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 595366812ea..8b214b9d345 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -179,8 +179,6 @@ build/gengtype-lex.o-warn = -Wno-error
 SYSCALLS.c.X-warn = -Wno-strict-prototypes -Wno-error
 # dfp.c contains alias violations
 dfp.o-warn = -Wno-error
-# dominance.c contains a -Wc++compat warning.
-dominance.o-warn = -Wno-error
 # mips-tfile.c contains -Wcast-qual warnings.
 mips-tfile.o-warn = -Wno-error
 
diff --git a/gcc/bitmap.h b/gcc/bitmap.h
index 7f17dc1d361..905eed359e9 100644
--- a/gcc/bitmap.h
+++ b/gcc/bitmap.h
@@ -194,8 +194,8 @@ extern hashval_t bitmap_hash(const_bitmap);
 #define BITMAP_GGC_ALLOC() bitmap_gc_alloc ()
 
 /* Do any cleanup needed on a bitmap when it is no longer used.  */
-#define BITMAP_FREE(BITMAP)			\
-	((void)(bitmap_obstack_free (BITMAP), (BITMAP) = NULL))
+#define BITMAP_FREE(BITMAP) \
+       ((void) (bitmap_obstack_free ((bitmap) BITMAP), (BITMAP) = (bitmap) NULL))
 
 /* Iterator for bitmaps.  */