You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
74 lines
2.0 KiB
Diff
74 lines
2.0 KiB
Diff
From 32d5f31bf11858d9282271980a923bdde2ed5ffe Mon Sep 17 00:00:00 2001
|
|
From: pagran <pagran@protonmail.com>
|
|
Date: Mon, 9 Jan 2023 13:30:36 +0100
|
|
Subject: [PATCH 2/3] add unexported function name removing
|
|
|
|
---
|
|
cmd/link/internal/ld/pcln.go | 30 +++++++++++++++++++++++++++++-
|
|
1 file changed, 29 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/cmd/link/internal/ld/pcln.go b/cmd/link/internal/ld/pcln.go
|
|
index b89a4d650c..ab13b15042 100644
|
|
--- a/cmd/link/internal/ld/pcln.go
|
|
+++ b/cmd/link/internal/ld/pcln.go
|
|
@@ -4,6 +4,8 @@
|
|
|
|
package ld
|
|
|
|
+import "unicode"
|
|
+
|
|
import (
|
|
"cmd/internal/goobj"
|
|
"cmd/internal/objabi"
|
|
@@ -321,10 +323,19 @@ func (state *pclntab) generateFuncnametab(ctxt *Link, funcs []loader.Sym) map[lo
|
|
return name[:i], "[...]", name[j+1:]
|
|
}
|
|
|
|
+ garbleTiny := os.Getenv("GARBLE_LINK_TINY") == "true"
|
|
+
|
|
// Write the null terminated strings.
|
|
writeFuncNameTab := func(ctxt *Link, s loader.Sym) {
|
|
symtab := ctxt.loader.MakeSymbolUpdater(s)
|
|
+ if garbleTiny {
|
|
+ symtab.AddStringAt(0, "")
|
|
+ }
|
|
+
|
|
for s, off := range nameOffsets {
|
|
+ if garbleTiny && off == 0 {
|
|
+ continue
|
|
+ }
|
|
a, b, c := nameParts(ctxt.loader.SymName(s))
|
|
o := int64(off)
|
|
o = symtab.AddStringAt(o, a)
|
|
@@ -335,9 +346,26 @@ func (state *pclntab) generateFuncnametab(ctxt *Link, funcs []loader.Sym) map[lo
|
|
|
|
// Loop through the CUs, and calculate the size needed.
|
|
var size int64
|
|
+
|
|
+ if garbleTiny {
|
|
+ size = 1 // first byte is reserved for empty string used for all non-exportable method names
|
|
+ }
|
|
+ isExported := func(name string) bool {
|
|
+ for _, r := range name[strings.LastIndexByte(name, '.')+1:] {
|
|
+ return unicode.IsUpper(r)
|
|
+ }
|
|
+ return false
|
|
+ }
|
|
+
|
|
walkFuncs(ctxt, funcs, func(s loader.Sym) {
|
|
- nameOffsets[s] = uint32(size)
|
|
a, b, c := nameParts(ctxt.loader.SymName(s))
|
|
+
|
|
+ if garbleTiny && !isExported(a) {
|
|
+ nameOffsets[s] = 0 // redirect name to empty string
|
|
+ return
|
|
+ }
|
|
+
|
|
+ nameOffsets[s] = uint32(size)
|
|
size += int64(len(a) + len(b) + len(c) + 1) // NULL terminate
|
|
})
|
|
|
|
--
|
|
2.40.1
|
|
|