* cygwin.sc: Remove duplicated .debug_macinfo section.

	* dllfixdbg: Also copy DWARF-2 sections into .dbg file.

1 files changed, 4 insertions, 1 deletions

diff --git a/winsup/cygwin/dllfixdbg b/winsup/cygwin/dllfixdbg
index 4ffc4e6ce..81f766b23 100755
--- a/winsup/cygwin/dllfixdbg
+++ b/winsup/cygwin/dllfixdbg
@@ -16,7 +16,10 @@ my $objdump = shift;
 my @objcopy = ((shift));
 my $dll = shift;
 my $dbg = shift;
-xit 0, @objcopy, '-j', '.stab', '-j', '.stabstr', $dll, $dbg;
+xit 0, @objcopy, '-j', '.stab', '-j', '.stabstr', '-j', '.debug_aranges',
+       '-j', '.debug_pubnames', '-j', '.debug_info', '-j', '.debug_abbrev',
+       '-j', '.debug_line', '-j', '.debug_frame', '-j', '.debug_str', '-j',
+       '.debug_loc', '-j', '.debug_macinfo', '-j', '.debug_ranges', $dll, $dbg;
 xit 0, @objcopy, '-g', '--add-gnu-debuglink=' . $dbg, $dll;
 open(OBJDUMP, '-|', "$objdump --headers $dll");
 my %section;