diff -rupN gdb-7.10-pristine/gdb/dwarf2read.c gdb-7.10-modified/gdb/dwarf2read.c --- gdb-7.10-pristine/gdb/dwarf2read.c 2015-08-28 17:22:07.000000000 -0400 +++ gdb-7.10-modified/gdb/dwarf2read.c 2015-10-02 10:16:58.959920909 -0400 @@ -17845,8 +17845,21 @@ dwarf_decode_lines_1 (struct line_header break; case DW_LNE_set_address: { - CORE_ADDR address - = read_address (abfd, line_ptr, cu, &bytes_read); + /* temporary fix until + * https://sourceware.org/bugzilla/show_bug.cgi?id=19033 + * is resolved. + * + * Contributed by: + * Simon Marchi + * Wed, 30 Sep 2015 17:25:43 -0400 + */ + unsigned char oplen = extended_end - line_ptr, old_address_size; + CORE_ADDR address; + old_address_size = cu->header.addr_size; + cu->header.addr_size = oplen; + address = read_address(abfd, line_ptr, cu, &bytes_read); + cu->header.addr_size = old_address_size; + /* end fix */ line_ptr += bytes_read; check_line_address (cu, &state_machine, line_ptr,