cmd/internal/link: merge .pdata and .xdata sections from host object files

[gostls13.git] / src / cmd / link / internal / ld / lib.go

diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
index c512d9a089e8aefbbdae0151bccac04097c81439..b603fba6c7181fa83e6723f6ed3614322076cb3e 100644 (file)
--- a/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
@@ -993,6 +993,11 @@ func typeSymbolMangle(name string) string {
        if strings.HasPrefix(name, "type:runtime.") {
                return name
        }
+       if strings.HasPrefix(name, "go:string.") {
+               // String symbols will be grouped to a single go:string.* symbol.
+               // No need to mangle individual symbol names.
+               return name
+       }
        if len(name) <= 14 && !strings.Contains(name, "@") { // Issue 19529
                return name
        }
@@ -1007,7 +1012,7 @@ func typeSymbolMangle(name string) string {
        // instantiated symbol, replace type name in []
        i := strings.IndexByte(name, '[')
        j := strings.LastIndexByte(name, ']')
-       if j == -1 {
+       if j == -1 || j <= i {
                j = len(name)
        }
        hash := notsha256.Sum256([]byte(name[i+1 : j]))
@@ -2215,15 +2220,21 @@ func ldobj(ctxt *Link, f *bio.Reader, lib *sym.Library, length int64, pn string,
                0xc401, // arm
                0x64aa: // arm64
                ldpe := func(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {
-                       textp, rsrc, err := loadpe.Load(ctxt.loader, ctxt.Arch, ctxt.IncVersion(), f, pkg, length, pn)
+                       ls, err := loadpe.Load(ctxt.loader, ctxt.Arch, ctxt.IncVersion(), f, pkg, length, pn)
                        if err != nil {
                                Errorf(nil, "%v", err)
                                return
                        }
-                       if len(rsrc) != 0 {
-                               setpersrc(ctxt, rsrc)
+                       if len(ls.Resources) != 0 {
+                               setpersrc(ctxt, ls.Resources)
                        }
-                       ctxt.Textp = append(ctxt.Textp, textp...)
+                       if ls.PData != 0 {
+                               sehp.pdata = append(sehp.pdata, ls.PData)
+                       }
+                       if ls.XData != 0 {
+                               sehp.xdata = append(sehp.xdata, ls.XData)
+                       }
+                       ctxt.Textp = append(ctxt.Textp, ls.Textp...)
                }
                return ldhostobj(ldpe, ctxt.HeadType, f, pkg, length, pn, file)
        }