diff -rup binutils.orig/gas/dwarf2dbg.c binutils-2.35.2/gas/dwarf2dbg.c --- binutils.orig/gas/dwarf2dbg.c 2021-08-09 17:50:48.324447191 +0100 +++ binutils-2.35.2/gas/dwarf2dbg.c 2021-08-09 17:51:03.308359865 +0100 @@ -616,7 +616,22 @@ get_directory_table_entry (const char * if (can_use_zero) { if (dirs == NULL || dirs[0] == NULL) - d = 0; + { + const char * pwd = getpwd (); + + if (dwarf_level >= 5 && strcmp (dirname, pwd) != 0) + { + /* In DWARF-5 the 0 entry in the directory table is expected to be + the same as the DW_AT_comp_dir (which is set to the current build + directory). Since we are about to create a directory entry that + is not the same, allocate the current directory first. + FIXME: Alternatively we could generate an error message here. */ + (void) get_directory_table_entry (pwd, strlen (pwd), TRUE); + d = 1; + } + else + d = 0; + } } else if (d == 0) d = 1; @@ -624,8 +639,8 @@ get_directory_table_entry (const char * if (d >= dirs_allocated) { unsigned int old = dirs_allocated; - - dirs_allocated = d + 32; +#define DIR_TABLE_INCREMENT 32 + dirs_allocated = d + DIR_TABLE_INCREMENT; dirs = XRESIZEVEC (char *, dirs, dirs_allocated); memset (dirs + old, 0, (dirs_allocated - old) * sizeof (char *)); } @@ -820,7 +835,7 @@ allocate_filename_to_slot (const char * dirlen = strlen (dirname); file = filename; } - + d = get_directory_table_entry (dirname, dirlen, num == 0); i = num; @@ -2062,7 +2077,12 @@ out_dir_and_file_list (segT line_seg, in Otherwise use pwd as main file directory. */ if (dirs_in_use > 0 && dirs != NULL && dirs[0] != NULL) dir = remap_debug_filename (dirs[0]); - else if (dirs_in_use > 1 && dirs != NULL && dirs[1] != NULL) + else if (dirs_in_use > 1 + && dirs != NULL + && dirs[1] != NULL + /* DWARF-5 directory tables expect dir[0] to be the same as + DW_AT_comp_dir, which is the same as pwd. */ + && dwarf_level < 5) dir = remap_debug_filename (dirs[1]); else dir = remap_debug_filename (getpwd ()); @@ -2165,8 +2185,8 @@ out_dir_and_file_list (segT line_seg, in uses slot zero, but that is only set explicitly using a .file 0 directive. If that isn't used, but file 1 is, then use that as main file name. */ - if (DWARF2_LINE_VERSION >= 5 && i == 0 && files_in_use >= 1) - files[0].filename = files[1].filename; + if (DWARF2_LINE_VERSION >= 5 && i == 0 && files_in_use >= 1 && files[0].filename == NULL) + files[0].filename = files[1].filename; else files[i].filename = ""; if (DWARF2_LINE_VERSION < 5 || i != 0) Only in binutils-2.35.2/gas/: dwarf2dbg.c.orig Only in binutils-2.35.2/gas/: dwarf2dbg.c.rej diff -rup binutils.orig/gas/testsuite/gas/elf/dwarf-5-file0.d binutils-2.35.2/gas/testsuite/gas/elf/dwarf-5-file0.d --- binutils.orig/gas/testsuite/gas/elf/dwarf-5-file0.d 2021-08-09 17:50:48.394446783 +0100 +++ binutils-2.35.2/gas/testsuite/gas/elf/dwarf-5-file0.d 2021-08-09 17:53:36.567466668 +0100 @@ -3,17 +3,18 @@ #readelf: -wl #... - The Directory Table \(offset 0x.*, lines 3, columns 1\): + The Directory Table \(offset 0x.*, lines 4, columns 1\): Entry Name - 0 \(indirect line string, offset: 0x.*\): master directory - 1 \(indirect line string, offset: 0x.*\): secondary directory - 2 \(indirect line string, offset: 0x.*\): /tmp +#... + 1 \(indirect line string, offset: 0x.*\): master directory + 2 \(indirect line string, offset: 0x.*\): secondary directory + 3 \(indirect line string, offset: 0x.*\): /tmp The File Name Table \(offset 0x.*, lines 3, columns 3\): Entry Dir MD5 Name - 0 0 0x00000000000000000000000000000000 \(indirect line string, offset: 0x.*\): master source file - 1 1 0x00000000000000000000000000000000 \(indirect line string, offset: 0x.*\): secondary source file - 2 2 0x95828e8bc4f7404dbf7526fb7bd0f192 \(indirect line string, offset: 0x.*\): foo.c + 0 1 0x00000000000000000000000000000000 \(indirect line string, offset: 0x.*\): master source file + 1 2 0x00000000000000000000000000000000 \(indirect line string, offset: 0x.*\): secondary source file + 2 3 0x95828e8bc4f7404dbf7526fb7bd0f192 \(indirect line string, offset: 0x.*\): foo.c #pass Only in binutils-2.35.2/gas/testsuite/gas/elf: dwarf-5-file0.d.orig Only in binutils-2.35.2/gas/testsuite/gas/elf: dwarf-5-file0.d.rej diff -rup binutils.orig/gas/testsuite/gas/elf/elf.exp binutils-2.35.2/gas/testsuite/gas/elf/elf.exp --- binutils.orig/gas/testsuite/gas/elf/elf.exp 2021-08-09 17:50:48.395446778 +0100 +++ binutils-2.35.2/gas/testsuite/gas/elf/elf.exp 2021-08-09 17:51:03.308359865 +0100 @@ -274,6 +274,7 @@ if { [is_elf_format] } then { run_dump_test "dwarf2-18" $dump_opts run_dump_test "dwarf2-19" $dump_opts run_dump_test "dwarf-5-file0" $dump_opts + run_dump_test "dwarf-5-dir0" $dump_opts run_dump_test "dwarf-4-cu" $dump_opts run_dump_test "dwarf-5-cu" $dump_opts run_dump_test "dwarf-5-nop-for-line-table" $dump_opts Only in binutils-2.35.2/gas/testsuite/gas/elf: elf.exp.orig diff -rup binutils.orig/gas/testsuite/gas/i386/dwarf5-line-1.d binutils-2.35.2/gas/testsuite/gas/i386/dwarf5-line-1.d --- binutils.orig/gas/testsuite/gas/i386/dwarf5-line-1.d 2021-08-09 17:50:48.363446964 +0100 +++ binutils-2.35.2/gas/testsuite/gas/i386/dwarf5-line-1.d 2021-08-09 17:51:03.308359865 +0100 @@ -33,7 +33,7 @@ Raw dump of debug contents of section \. The Directory Table \(offset 0x.*, lines 2, columns 1\): Entry Name - 0 \(indirect line string, offset: 0x.*\): .*/gas/testsuite/gas/i386 + 0 \(indirect line string, offset: 0x.*\): .*/gas/testsuite 1 \(indirect line string, offset: 0x.*\): .*/gas/testsuite/gas/i386 The File Name Table \(offset 0x.*, lines 2, columns 3\): diff -rup binutils.orig/gas/testsuite/gas/i386/dwarf5-line-2.d binutils-2.35.2/gas/testsuite/gas/i386/dwarf5-line-2.d --- binutils.orig/gas/testsuite/gas/i386/dwarf5-line-2.d 2021-08-09 17:50:48.365446953 +0100 +++ binutils-2.35.2/gas/testsuite/gas/i386/dwarf5-line-2.d 2021-08-09 17:51:03.308359865 +0100 @@ -33,7 +33,7 @@ Raw dump of debug contents of section \. The Directory Table \(offset 0x.*, lines 2, columns 1\): Entry Name - 0 \(indirect line string, offset: 0x.*\): .*/gas/testsuite/gas/i386 + 0 \(indirect line string, offset: 0x.*\): .*/gas/testsuite 1 \(indirect line string, offset: 0x.*\): .*/gas/testsuite/gas/i386 The File Name Table \(offset 0x.*, lines 1, columns 3\): --- /dev/null 2021-08-09 07:51:33.817495606 +0100 +++ binutils-2.35.2/gas/testsuite/gas/elf/dwarf-5-dir0.s 2021-08-09 17:55:06.745941103 +0100 @@ -0,0 +1,19 @@ + .section .debug_info,"",%progbits + .4byte 0x8a + .2byte 0x2 + .4byte .Ldebug_abbrev0 + .byte 0x4 + .uleb128 0x1 + + .file 0 "../not-the-build-directory/master-source-file.c" + .line 1 + .text + .octa 0x12345678901234567890123456789012 + + .file 1 "secondary directory/secondary source file" + .line 2 + .word 2 + + .file 2 "/tmp" "foo.c" md5 0x95828e8bc4f7404dbf7526fb7bd0f192 + .line 5 + .word 6 --- /dev/null 2021-08-09 07:51:33.817495606 +0100 +++ binutils-2.35.2/gas/testsuite/gas/elf/dwarf-5-dir0.d 2021-08-09 17:55:06.745941103 +0100 @@ -0,0 +1,20 @@ +#as: --gdwarf-5 +#name: DWARF5 dir[0] +#readelf: -wl + +#... + The Directory Table \(offset 0x.*, lines 4, columns 1\): + Entry Name + 0 \(indirect line string, offset: 0x0\): .*/gas/testsuite + 1 \(indirect line string, offset: 0x.*\): ../not-the-build-directory + 2 \(indirect line string, offset: 0x.*\): secondary directory + 3 \(indirect line string, offset: 0x.*\): /tmp + + The File Name Table \(offset 0x.*, lines 3, columns 3\): + Entry Dir MD5 Name + 0 1 0x0+ \(indirect line string, offset: 0x.*\): master-source-file.c + 1 2 0x0+ \(indirect line string, offset: 0x.*\): secondary source file + 2 3 0x95828e8bc4f7404dbf7526fb7bd0f192 \(indirect line string, offset: 0x.*\): foo.c +#pass + +