diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1fa4ade707c..916f85160f4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-13  Andrew Pinski  <pinskia@gmail.com>
+	    David Daney  <ddaney@avtrex.com>
+
+	PR bootstrap/34144
+	* system.h: Make -Wuninitialized non-fatal if ASSERT_CHECKING
+	is disabled.
+
 2007-12-13  Jakub Jelinek  <jakub@redhat.com>
 
 	PR rtl-optimization/32636
diff --git a/gcc/system.h b/gcc/system.h
index 65f27379ad1..92b045c1a5e 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -797,6 +797,11 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
 /* Activate -Wcast-qual as a warning (not an error/-Werror).  */
 #if GCC_VERSION >= 4003
 #pragma GCC diagnostic warning "-Wcast-qual"
+/* If asserts are disabled, activate -Wuninitialized as a warning (not
+   an error/-Werror).  */
+#ifndef ASSERT_CHECKING
+#pragma GCC diagnostic warning "-Wuninitialized"
+#endif
 #endif
 
 #endif /* ! GCC_SYSTEM_H */