From 7ce1a4bdc0befea976f74dc717dc1e2eccd5bd73 Mon Sep 17 00:00:00 2001 From: Wei Guangjing Date: Sat, 23 Jul 2011 12:21:13 -0400 Subject: [PATCH] ld: fixes .bss for ldpe R=golang-dev, rsc CC=golang-dev https://golang.org/cl/4794056 --- src/cmd/ld/ldpe.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cmd/ld/ldpe.c b/src/cmd/ld/ldpe.c index 3423b71a18..049edeb23f 100644 --- a/src/cmd/ld/ldpe.c +++ b/src/cmd/ld/ldpe.c @@ -222,6 +222,8 @@ ldpe(Biobuf *f, char *pkg, int64 len, char *pn) s->type = SRODATA; break; case IMAGE_SCN_CNT_UNINITIALIZED_DATA|IMAGE_SCN_MEM_READ|IMAGE_SCN_MEM_WRITE: //.bss + s->type = SBSS; + break; case IMAGE_SCN_CNT_INITIALIZED_DATA|IMAGE_SCN_MEM_READ|IMAGE_SCN_MEM_WRITE: //.data s->type = SDATA; break; @@ -382,6 +384,8 @@ map(PeObj *obj, PeSect *sect) return 0; sect->base = mal(sect->sh.SizeOfRawData); + if(sect->sh.PointerToRawData == 0) // .bss don't has data in object file. + return 0; werrstr("short read"); if(Bseek(obj->f, obj->base+sect->sh.PointerToRawData, 0) < 0 || Bread(obj->f, sect->base, sect->sh.SizeOfRawData) != sect->sh.SizeOfRawData) -- 2.48.1