diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 632ed878e8..f74f1c4660 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-15  Doug Evans  <dje@google.com>
+
+	* dwarf2read.c (dwarf_decode_lines_1): Move definition of adj_opcode
+	closer to use.
+
 2014-08-15  Doug Evans  <dje@google.com>
 
 	* dwarf2read.c (dwarf_decode_lines_1): Add comment.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 6bc57939a8..801f05d9b9 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -17182,7 +17182,7 @@ dwarf_decode_lines_1 (struct line_header *lh, const char *comp_dir,
   const gdb_byte *line_ptr, *extended_end;
   const gdb_byte *line_end;
   unsigned int bytes_read, extended_len;
-  unsigned char op_code, extended_op, adj_opcode;
+  unsigned char op_code, extended_op;
   CORE_ADDR baseaddr;
   struct objfile *objfile = cu->objfile;
   bfd *abfd = objfile->obfd;
@@ -17237,6 +17237,7 @@ dwarf_decode_lines_1 (struct line_header *lh, const char *comp_dir,
 	  if (op_code >= lh->opcode_base)
 	    {
 	      /* Special opcode.  */
+	      unsigned char adj_opcode;
 
 	      adj_opcode = op_code - lh->opcode_base;
 	      address += (((op_index + (adj_opcode / lh->line_range))