diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index de5c50fccd1..767af3eb5cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-27  Richard Sandiford  <rsandifo@redhat.com>
+
+	* dbxout.c (dbxout_source_line): Move declaration of begin_label to
+	the block that needs it.
+
 2004-10-27  Zack Weinberg  <zack@codesourcery.com>
 
 	* dbxout.c (dbxout_finish_complex_stabs): Mark 'line' variable
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index a8486f5c1a2..f1bde1dd6ea 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -1234,8 +1234,6 @@ dbxout_begin_prologue (unsigned int lineno, const char *filename)
 static void
 dbxout_source_line (unsigned int lineno, const char *filename)
 {
-  const char *begin_label = XSTR(XEXP(DECL_RTL(current_function_decl), 0), 0);
-
   dbxout_source_file (filename);
 
 #ifdef DBX_OUTPUT_SOURCE_LINE
@@ -1243,9 +1241,10 @@ dbxout_source_line (unsigned int lineno, const char *filename)
 #else
   if (DBX_LINES_FUNCTION_RELATIVE)
     {
+      rtx begin_label = XEXP (DECL_RTL (current_function_decl), 0);
       dbxout_begin_stabn_sline (lineno);
       dbxout_stab_value_internal_label_diff ("LM", &dbxout_source_line_counter,
-					     begin_label);
+					     XSTR (begin_label, 0));
 
     }
   else