From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 26 Nov 2021 20:03:00 +0000 (-0800)
Subject: gas: Update commit 4780e5e4933
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8677059126a84cb9f71371beb8688138a41014fc;p=binutils-gdb.git

gas: Update commit 4780e5e4933

Update

commit 4780e5e4933a2497a5aecc4ceabbbb8e82aaf822
Author: Tom de Vries <tdevries@suse.de>
Date:   Fri Nov 26 09:59:45 2021 +0100

    [gas] Fix file 0 dir with -gdwarf-5

1. Replace i with j in

  for (j = 0; i < NUM_MD5_BYTES; ++j)

2. Pass -W to readelf to force CU: in output due to:

	      if (do_wide || strlen (directory) < 76)
		printf (_("CU: %s/%s:\n"), directory, file_table[0].name);
	      else
		printf ("%s:\n", file_table[0].name);

	PR gas/28629
	* dwarf2dbg.c (out_dir_and_file_list): Fix a typo in commit
	4780e5e4933.
	* testsuite/gas/elf/dwarf-5-nop-for-line-table.d: Pass -W to
	readelf.
---

diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index 7300bfe2648..8e91bef20ab 100644
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -2279,7 +2279,7 @@ out_dir_and_file_list (segT line_seg, int sizeof_offset)
 	      files[0].filename = files[1].filename;
 	      files[0].dir = files[1].dir;
 	      if (emit_md5)
-		for (j = 0; i < NUM_MD5_BYTES; ++j)
+		for (j = 0; j < NUM_MD5_BYTES; ++j)
 		  files[0].md5[j] = files[1].md5[j];
 	    }
 	  else
diff --git a/gas/testsuite/gas/elf/dwarf-5-nop-for-line-table.d b/gas/testsuite/gas/elf/dwarf-5-nop-for-line-table.d
index 651a1a20707..6137bc5f40b 100644
--- a/gas/testsuite/gas/elf/dwarf-5-nop-for-line-table.d
+++ b/gas/testsuite/gas/elf/dwarf-5-nop-for-line-table.d
@@ -1,6 +1,6 @@
 #as: --gdwarf-5
 #name: Check line table is produced with .nops
-#readelf: -wL
+#readelf: -W -wL
 
 #...
 Contents of the .debug_line section: