diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 570590be5399..ebeaf290471e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-05  Richard Guenther  <rguenther@suse.de>
+
+	PR bootstrap/40350
+	* dwarf2out.c (dwarf2out_begin_function): Mark discriminator
+	as possibly unused.
+
 2009-06-04  Jakub Jelinek  <jakub@redhat.com>
 
 	* config/s390/s390.c (global_not_special_regno_p): New static inline.
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index dc5ed24c18ae..e78d334fea8e 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -16226,7 +16226,7 @@ dwarf2out_begin_function (tree fun)
 
 static void
 dwarf2out_source_line (unsigned int line, const char *filename,
-                       int discriminator)
+                       int discriminator ATTRIBUTE_UNUSED)
 {
   if (debug_info_level >= DINFO_LEVEL_NORMAL
       && line != 0)