From 4d6ae73dfc5f0856e58aca2a892f27b2ab80b148 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 11 Jun 2018 16:46:23 -0700 Subject: [release-branch.go1.10] cmd/link: treat cgo exported symbols as C symbols Fixes #25827 Change-Id: I6736c3ac061ca32aac2eb68b01ba53a179d68cf4 Reviewed-on: https://go-review.googlesource.com/118076 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: Russ Cox (cherry picked from commit f861f66d1db9f1abcdf91fc54d0d84bd3f9e9310) Reviewed-on: https://go-review.googlesource.com/126455 Reviewed-by: Brad Fitzpatrick --- src/cmd/link/internal/ld/pcln.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cmd/link/internal/ld/pcln.go b/src/cmd/link/internal/ld/pcln.go index 8708924d92..ed1b523b4e 100644 --- a/src/cmd/link/internal/ld/pcln.go +++ b/src/cmd/link/internal/ld/pcln.go @@ -11,6 +11,7 @@ import ( "log" "os" "path/filepath" + "strings" ) // iteration over encoded pcdata tables. @@ -162,13 +163,15 @@ func renumberfiles(ctxt *Link, files []*sym.Symbol, d *sym.Pcdata) { *d = out } -// onlycsymbol reports whether this is a cgo symbol provided by the -// runtime and only used from C code. +// onlycsymbol reports whether this is a symbol that is referenced by C code. func onlycsymbol(s *sym.Symbol) bool { switch s.Name { case "_cgo_topofstack", "_cgo_panic", "crosscall2": return true } + if strings.HasPrefix(s.Name, "_cgoexp_") { + return true + } return false } -- cgit v1.2.3-54-g00ecf