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/6l/asm.c

@@ -787,6 +787,9 @@ asmb(void)
 			symo = rnd(symo, PEFILEALIGN);
 			break;
 		}
+		switch(HEADTYPE) {
+		default:
+			if(iself) {
 				/*
 				 * the symbol information is stored as
 				 *	32-bit symbol table size
@@ -808,7 +811,6 @@ asmb(void)
 				lputl(symsize);
 				lputl(lcsize);
 				cflush();
-		if(HEADTYPE != Hwindows && !debug['s']) {
 				elfsymo = symo+8+symsize+lcsize;
 				seek(cout, elfsymo, 0);
 				asmelfsym64();
@@ -822,6 +824,14 @@ asmb(void)
 
 				dwarfemitdebugsections();
 			}
+			break;
+		case Hwindows:
+			if(debug['v'])
+			       Bprint(&bso, "%5.2f dwarf\n", cputime());
+
+			dwarfemitdebugsections();
+			break;
+		}
 	}
 
 	if(debug['v'])

src/cmd/8l/asm.c

@@ -742,12 +742,29 @@ asmb(void)
 			symo = rnd(symo, INITRND);
 			break;
 		case Hwindows:
-			// TODO(brainman): not sure what symo meant to be, but it is not used for Windows PE for now anyway
 			symo = rnd(HEADR+segtext.filelen, PEFILEALIGN)+segdata.filelen;
 			symo = rnd(symo, PEFILEALIGN);
 			break;
 		}
-		if(HEADTYPE == Hplan9x32) {
+		switch(HEADTYPE) {
+		default:
+			if(iself) {
+				if(debug['v'])
+				       Bprint(&bso, "%5.2f elfsym\n", cputime());
+				elfsymo = symo+8+symsize+lcsize;
+				seek(cout, elfsymo, 0);
+				asmelfsym32();
+				cflush();
+				elfstro = seek(cout, 0, 1);
+				elfsymsize = elfstro - elfsymo;
+				ewrite(cout, elfstrdat, elfstrsize);
+
+				if(debug['v'])
+					Bprint(&bso, "%5.2f dwarf\n", cputime());
+				dwarfemitdebugsections();
+			}
+			break;
+		case Hplan9x32:
 			seek(cout, symo, 0);
 			asmplan9sym();
 			cflush();
@@ -760,20 +777,13 @@ asmb(void)
 				
 				cflush();
 			}
-		} else if(iself) {
-			if(debug['v'])
-			       Bprint(&bso, "%5.2f elfsym\n", cputime());
-			elfsymo = symo+8+symsize+lcsize;
-			seek(cout, elfsymo, 0);
-			asmelfsym32();
-			cflush();
-			elfstro = seek(cout, 0, 1);
-			elfsymsize = elfstro - elfsymo;
-			ewrite(cout, elfstrdat, elfstrsize);
-
+			break;
+		case Hwindows:
+			seek(cout, symo, 0);
 			if(debug['v'])
 				Bprint(&bso, "%5.2f dwarf\n", cputime());
 			dwarfemitdebugsections();
+			break;
 		}
 	}
 	if(debug['v'])

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);

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;