From 34ac4ec30ca8bca47fb3552bae0116ef140b11cb Mon Sep 17 00:00:00 2001 From: Alex Brainman Date: Fri, 13 May 2011 16:05:47 +1000 Subject: 6l, 8l: emit windows dwarf sections similar to other platforms R=golang-dev, rsc CC=golang-dev, vcc.163 https://golang.org/cl/4517056 --- src/cmd/ld/dwarf.c | 1 - src/cmd/ld/pe.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/cmd/ld') diff --git a/src/cmd/ld/dwarf.c b/src/cmd/ld/dwarf.c index 98b068008b..ed11f5e5ac 100644 --- a/src/cmd/ld/dwarf.c +++ b/src/cmd/ld/dwarf.c @@ -2562,7 +2562,6 @@ dwarfaddmachoheaders(void) void dwarfaddpeheaders(void) { - dwarfemitdebugsections(); newPEDWARFSection(".debug_abbrev", abbrevsize); newPEDWARFSection(".debug_line", linesize); newPEDWARFSection(".debug_frame", framesize); diff --git a/src/cmd/ld/pe.c b/src/cmd/ld/pe.c index d523ca9c5b..1c0c665383 100644 --- a/src/cmd/ld/pe.c +++ b/src/cmd/ld/pe.c @@ -484,13 +484,13 @@ asmbpe(void) d->Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA| IMAGE_SCN_MEM_READ|IMAGE_SCN_MEM_WRITE; + if(!debug['s']) + dwarfaddpeheaders(); + addimports(nextfileoff, d); addexports(nextfileoff); - if(!debug['s']) - dwarfaddpeheaders(); - addsymtable(); fh.NumberOfSections = nsect; -- cgit v1.3-5-g9baa