diff --git a/src/cmd/link/internal/ld/elf.go b/src/cmd/link/internal/ld/elf.go
index 81011638bc5..e03473a21ae 100644
--- a/src/cmd/link/internal/ld/elf.go
+++ b/src/cmd/link/internal/ld/elf.go
@@ -1107,8 +1107,10 @@ func elfshbits(linkmode LinkMode, sect *sym.Section) *ElfShdr {
 	}
 	sh.Addralign = uint64(sect.Align)
 	sh.Size = sect.Length
-	if sect.Name != ".tbss" {
+	if sh.Type != uint32(elf.SHT_NOBITS) {
 		sh.Off = sect.Seg.Fileoff + sect.Vaddr - sect.Seg.Vaddr
+	} else {
+		sh.Off = sect.Seg.Fileoff + sect.Seg.Filelen
 	}
 
 	return sh