core/overreach: rmv linkname

Author: ignoramous

Makefile

@@ -10,7 +10,7 @@ XGO_LDFLAGS='-s -w -X main.version=$(COMMIT_ID)'
 # github.com/xjasonlyu/tun2socks/blob/bf745d0e0/Makefile#L14
 LDFLAGS_DEBUG='-buildid= -X $(IMPORT_PATH)/intra/core.Date=$(DATESTR) -X $(IMPORT_PATH)/intra/core.Commit=$(COMMIT_ID)'
 LDFLAGS='-w -s -buildid= -X $(IMPORT_PATH)/intra/core.Date=$(DATESTR) -X $(IMPORT_PATH)/intra/core.Commit=$(COMMIT_ID)'
-CGO_LDFLAGS="$(CGO_LDFLAGS) -checklinkname=0 -s -w -Wl,-z,max-page-size=16384"
+CGO_LDFLAGS="$(CGO_LDFLAGS) -s -w -Wl,-z,max-page-size=16384"
 
 # github.com/golang/mobile/blob/a1d90793fc/cmd/gomobile/bind.go#L36
 GOBIND=bind -trimpath -v -x -a -javapkg com.celzero.firestack

intra/core/overreach.go

@@ -8,21 +8,9 @@ package core
 
 import (
 	"syscall"
-	_ "unsafe"
-) // required for go:linkname
-
-//go:linkname runtimeGoTraceback gotraceback
-func runtimeGoTraceback() (level int32, all, crash bool)
-
-// GoTraceback returns the Go runtime's current traceback settings.
-func GoTraceback() (level int32, all, crash bool) {
-	return runtimeGoTraceback()
-}
+)
 
 // RuntimeEnviron returns the Go runtime's cached environment slice.
-//
-// Warning: building with this file enabled requires disabling the linker's
-// linkname checks: `-ldflags=-checklinkname=0`.
 func RuntimeEnviron() []string {
 	return syscall.Environ()
 }

intra/tunnel.go

@@ -518,8 +518,7 @@ func (t *rtunnel) stat() (*x.NetStat, error) {
 	out.GOSt.NumCgo = int64(runtime.NumCgoCall())
 	out.GOSt.NumCPU = int64(runtime.NumCPU())
 
-	level, all, crash := core.GoTraceback()
-	out.GOSt.Args = fmt.Sprintf("%d;%t;%t", level, all, crash)
+	out.GOSt.Args = strings.Join(os.Args, ";")
 	out.GOSt.Env = strings.Join(core.RuntimeEnviron(), ";")
 	out.GOSt.Pers, _ = os.Executable()