From c02cd04fe170071c8bb28bcdf6b7ed10b02d2e69 Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Wed, 25 Mar 2020 17:22:57 -0400 Subject: [PATCH] [dev.link] cmd/link: fix buglet in setupdynexp This should restore deterministic order of dynexp, and fix Solaris build. Change-Id: Icb796babaa3238bff90fd8255ee9f023f2306c26 Reviewed-on: https://go-review.googlesource.com/c/go/+/225538 Run-TryBot: Cherry Zhang TryBot-Result: Gobot Gobot Reviewed-by: Than McIntosh --- src/cmd/link/internal/ld/lib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go index 01dc31b4d8..88c51d65b3 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go @@ -620,7 +620,7 @@ func setupdynexp(ctxt *Link) { panic("dynexp entry not reachable") } } - sort.Slice(dynexp, func(i, j int) bool { + sort.Slice(d, func(i, j int) bool { return ctxt.loader.SymName(d[i]) < ctxt.loader.SymName(d[j]) }) -- 2.48.1