cmd/link: no dwarf on darwin/arm

Partial revert of cl/10284 to get -buildmode=c-archive working for
darwin/arm.

Manually tested with iostest.bash while builder is offline.

Change-Id: I98e4e209765666e320e680e11151fce59e2afde9
Reviewed-on: https://go-review.googlesource.com/11306
Reviewed-by: Russ Cox <rsc@golang.org>
Run-TryBot: David Crawshaw <crawshaw@golang.org>

diff --git a/src/cmd/link/internal/ld/macho.go b/src/cmd/link/internal/ld/macho.go
index 1f14db744fc5821ab91fd2656d84ea085890e76a..68531069c3d1295f18040c947f169b7cd1b9a891 100644 (file)
--- a/src/cmd/link/internal/ld/macho.go
+++ b/src/cmd/link/internal/ld/macho.go
@@ -444,8 +444,12 @@ func Asmbmacho() {
                ms = newMachoSeg("", 40)
 
                ms.fileoffset = Segtext.Fileoff
-               ms.filesize = Segdwarf.Fileoff + Segdwarf.Filelen - Segtext.Fileoff
-               ms.vsize = ms.filesize
+               if Thearch.Thechar == '5' {
+                       ms.filesize = Segdata.Fileoff + Segdata.Filelen - Segtext.Fileoff
+               } else {
+                       ms.filesize = Segdwarf.Fileoff + Segdwarf.Filelen - Segtext.Fileoff
+                       ms.vsize = ms.filesize
+               }
        }
 
        /* segment for zero page */