aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCherry Mui <cherryyz@google.com>2023-06-12 13:46:08 -0400
committerCherry Mui <cherryyz@google.com>2023-07-27 20:07:01 +0000
commit1ea8d38517b058851bf6118f1bd9a317db9ed702 (patch)
treea537b144311e3ecc894ed44eda49b1c04bd9bed0
parentb2ffc23a828c9b86501fed7148de9a3f558c6162 (diff)
downloadgo-1ea8d38517b058851bf6118f1bd9a317db9ed702.tar.gz
go-1ea8d38517b058851bf6118f1bd9a317db9ed702.zip
[release-branch.go1.21] cmd/link: don't generate DYSYMTAB when external linking on Mach-O
When external linking, the external linker will generate it. Updates #60694. For #61229. Change-Id: I086a7628dd9baa84b46315641746fc3640473f2b Reviewed-on: https://go-review.googlesource.com/c/go/+/502617 Reviewed-by: Than McIntosh <thanm@google.com> Run-TryBot: Cherry Mui <cherryyz@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> (cherry picked from commit f55e7e104bbef911f1495b39c3c2ff366ad3be4d) Reviewed-on: https://go-review.googlesource.com/c/go/+/513757
-rw-r--r--src/cmd/link/internal/ld/macho.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/link/internal/ld/macho.go b/src/cmd/link/internal/ld/macho.go
index e43a1aa002..88ff787af5 100644
--- a/src/cmd/link/internal/ld/macho.go
+++ b/src/cmd/link/internal/ld/macho.go
@@ -833,9 +833,9 @@ func asmbMacho(ctxt *Link) {
ml.data[2] = uint32(linkoff + s1 + s2 + s3 + s4 + s5) /* stroff */
ml.data[3] = uint32(s6) /* strsize */
- machodysymtab(ctxt, linkoff+s1+s2)
-
if ctxt.LinkMode != LinkExternal {
+ machodysymtab(ctxt, linkoff+s1+s2)
+
ml := newMachoLoad(ctxt.Arch, LC_LOAD_DYLINKER, 6)
ml.data[0] = 12 /* offset to string */
stringtouint32(ml.data[1:], "/usr/lib/dyld")