From 58578de0dc36c9696cc15c1c037131866604fb51 Mon Sep 17 00:00:00 2001 From: David Crawshaw Date: Mon, 22 Jun 2015 19:59:59 -0400 Subject: [PATCH] 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 Run-TryBot: David Crawshaw --- src/cmd/link/internal/ld/macho.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cmd/link/internal/ld/macho.go b/src/cmd/link/internal/ld/macho.go index 1f14db744f..68531069c3 100644 --- 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 */ -- 2.50.0