diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc794a25a42..e61da32acfd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-24  Daniel Berlin  <dberlin@dberlin.org>
+
+	* config/darwin.c (darwin_override_options): Don't force on
+	flag_var_tracking_uninit when no debug info is requested.
+
 2007-07-25  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	* cfgloop.c (init_loops_structure): New function.
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 0673915200f..d84d2802246 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -1729,7 +1729,8 @@ darwin_override_options (void)
       flag_non_call_exceptions = 0;
     }
   if (flag_var_tracking
-      && strverscmp (darwin_macosx_version_min, "10.5") >= 0)
+      && strverscmp (darwin_macosx_version_min, "10.5") >= 0
+      && debug_info_level >= DINFO_LEVEL_NORMAL)
     flag_var_tracking_uninit = 1;
 }