* cygwin.sc: Remove duplicated .debug_macinfo section.

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

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2a255a6ab142e61745d725a7264e644f8824df38..3ab96d04e2cf50882ee77c45f4ee71fa6f9912e6 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-18  Brian Dessent  <brian@dessent.net>
+
+       * cygwin.sc: Remove duplicated .debug_macinfo section.
+       * dllfixdbg: Also copy DWARF-2 sections into .dbg file.
+
 2007-04-06  Eric Blake  <ebb9@byu.net>
 
        * include/stdint.h (WINT_MIN): Fix sign.

diff --git a/winsup/cygwin/cygwin.sc b/winsup/cygwin/cygwin.sc
index 6247e86cc59497fffb11444b25a0dafffd147eb0..30b7b691abe7701d70c3bd380a76450e8a1c89b3 100644 (file)
--- a/winsup/cygwin/cygwin.sc
+++ b/winsup/cygwin/cygwin.sc
@@ -138,6 +138,5 @@ SECTIONS
   .debug_str      ALIGN(__section_alignment__) (NOLOAD) : { *(.debug_str) }
   .debug_loc      ALIGN(__section_alignment__) (NOLOAD) : { *(.debug_loc) }
   .debug_macinfo  ALIGN(__section_alignment__) (NOLOAD) : { *(.debug_macinfo) }
-  .debug_macinfo  ALIGN(__section_alignment__) (NOLOAD) : { *(.debug_macinfo) }
   .debug_ranges   ALIGN(__section_alignment__) (NOLOAD) : { *(.debug_ranges) }
 }

diff --git a/winsup/cygwin/dllfixdbg b/winsup/cygwin/dllfixdbg
index 4ffc4e6ce3079d684949b49e3e154663af788ce6..81f766b23aface3aca4985b814dfd55380a91545 100755 (executable)
--- 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;