diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4f712e3fe7f..fa015e0be37 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-18  David Edelsohn  <dje.gcc@gmail.com>
+
+	* dwarf2out.c (switch_to_eh_frame_section): Add ATTRIBUTE_UNUSED to
+	"back" parameter. Declare label in #if block.
+
 2015-09-18  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR middle-end/67619
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 4a1c15245de..9ef2a8a0e7f 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -434,10 +434,8 @@ stripattributes (const char *s)
    for collect2 the first time around.  */
 
 static void
-switch_to_eh_frame_section (bool back)
+switch_to_eh_frame_section (bool back ATTRIBUTE_UNUSED)
 {
-  tree label;
-
   if (eh_frame_section == 0)
     {
       int flags;
@@ -481,7 +479,7 @@ switch_to_eh_frame_section (bool back)
      collect2.  */
   if (!back)
     {
-      label = get_file_function_name ("F");
+      tree label = get_file_function_name ("F");
       ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (PTR_SIZE));
       targetm.asm_out.globalize_label (asm_out_file,
 					IDENTIFIER_POINTER (label));