From: Go Compiler Team Date: Wed, 23 May 2018 03:24:03 +0000 (+0100) Subject: reproducible-BUILD_PATH_PREFIX_MAP X-Git-Tag: archive/raspbian/1.15.5-2+rpi1~1^2^2^2^2^2^2^2^2^2^2^2^2^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1db3ccabc62129d74a67571d2aa21f61df09c721;p=golang-1.15.git reproducible-BUILD_PATH_PREFIX_MAP Gbp-Pq: Name 0002-reproducible-BUILD_PATH_PREFIX_MAP.patch --- diff --git a/src/cmd/go/internal/work/gc.go b/src/cmd/go/internal/work/gc.go index 71b53379..b4dbdd4b 100644 --- a/src/cmd/go/internal/work/gc.go +++ b/src/cmd/go/internal/work/gc.go @@ -456,7 +456,10 @@ func (gcToolchain) ld(b *Builder, root *Action, out, importcfg, mainpkg string) dir, out = filepath.Split(out) } - return b.run(root, dir, root.Package.ImportPath, nil, cfg.BuildToolexec, base.Tool("link"), "-o", out, "-importcfg", importcfg, ldflags, mainpkg) + // Apply the rewrite of $WORK to /tmp/go-build also to DWARF file tables: + env := []string{"BUILD_PATH_PREFIX_MAP=/tmp/go-build=" + b.WorkDir + ":" + os.Getenv("BUILD_PATH_PREFIX_MAP")} + + return b.run(root, dir, root.Package.ImportPath, env, cfg.BuildToolexec, base.Tool("link"), "-o", out, "-importcfg", importcfg, ldflags, mainpkg) } func (gcToolchain) ldShared(b *Builder, root *Action, toplevelactions []*Action, out, importcfg string, allactions []*Action) error { diff --git a/src/cmd/link/internal/ld/buildpathprefix.go b/src/cmd/link/internal/ld/buildpathprefix.go new file mode 100644 index 00000000..8cda8a5f --- /dev/null +++ b/src/cmd/link/internal/ld/buildpathprefix.go @@ -0,0 +1,56 @@ +// Copyright 2010 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package ld + +import ( + "log" + "os" + "strings" + "sync" +) + +func decode(s string) string { + s = strings.Replace(s, "%.", ":", -1) + s = strings.Replace(s, "%+", "=", -1) + s = strings.Replace(s, "%#", "%", -1) + return s +} + +type prefixMapEntry struct { + target string + source string +} + +var ( + buildPathPrefixMap []prefixMapEntry + buildPathPrefixMapOnce sync.Once +) + +// See https://reproducible-builds.org/specs/build-path-prefix-map/ +func applyBuildPathPrefixMap(dir string) string { + // Parse the BUILD_PATH_PREFIX_MAP only once; this function gets called for + // every compiled file. + buildPathPrefixMapOnce.Do(func() { + for _, item := range strings.Split(os.Getenv("BUILD_PATH_PREFIX_MAP"), ":") { + if strings.TrimSpace(item) == "" { + continue + } + parts := strings.Split(item, "=") + if got, want := len(parts), 2; got != want { + log.Fatalf("parsing BUILD_PATH_PREFIX_MAP: incorrect number of = separators in item %q: got %d, want %d", item, got-1, want-1) + } + buildPathPrefixMap = append(buildPathPrefixMap, prefixMapEntry{ + target: decode(parts[0]), + source: decode(parts[1]), + }) + } + }) + for _, e := range buildPathPrefixMap { + if strings.HasPrefix(dir, e.source) { + return e.target + strings.TrimPrefix(dir, e.source) + } + } + return dir +} diff --git a/src/cmd/link/internal/ld/dwarf.go b/src/cmd/link/internal/ld/dwarf.go index 4642bdbe..204fb77f 100644 --- a/src/cmd/link/internal/ld/dwarf.go +++ b/src/cmd/link/internal/ld/dwarf.go @@ -1131,7 +1131,7 @@ func writelines(ctxt *Link, lib *sym.Library, textp []*sym.Symbol, ls *sym.Symbo newattr(dwinfo, dwarf.DW_AT_language, dwarf.DW_CLS_CONSTANT, int64(lang), 0) newattr(dwinfo, dwarf.DW_AT_stmt_list, dwarf.DW_CLS_PTR, ls.Size, ls) // OS X linker requires compilation dir or absolute path in comp unit name to output debug info. - compDir := getCompilationDir() + compDir := applyBuildPathPrefixMap(getCompilationDir()) // TODO: Make this be the actual compilation directory, not // the linker directory. If we move CU construction into the // compiler, this should happen naturally. @@ -1186,7 +1186,7 @@ func writelines(ctxt *Link, lib *sym.Library, textp []*sym.Symbol, ls *sym.Symbo } // File indexes are 1-based. fileNums[int(f.Value)] = len(fileNums) + 1 - Addstring(ls, f.Name) + Addstring(ls, applyBuildPathPrefixMap(f.Name)) ls.AddUint8(0) ls.AddUint8(0) ls.AddUint8(0) diff --git a/src/cmd/link/internal/ld/pcln.go b/src/cmd/link/internal/ld/pcln.go index 8708924d..6f27871a 100644 --- a/src/cmd/link/internal/ld/pcln.go +++ b/src/cmd/link/internal/ld/pcln.go @@ -301,7 +301,7 @@ func (ctxt *Link) pclntab() { off = int32(ftab.SetAddr(ctxt.Arch, int64(off), s)) // name int32 - nameoff := nameToOffset(s.Name) + nameoff := nameToOffset(applyBuildPathPrefixMap(s.Name)) off = int32(ftab.SetUint32(ctxt.Arch, int64(off), uint32(nameoff))) // args int32 @@ -446,7 +446,7 @@ func (ctxt *Link) pclntab() { ftab.SetUint32(ctxt.Arch, int64(start), uint32(len(ctxt.Filesyms)+1)) for i := len(ctxt.Filesyms) - 1; i >= 0; i-- { s := ctxt.Filesyms[i] - ftab.SetUint32(ctxt.Arch, int64(start)+s.Value*4, uint32(ftabaddstring(ctxt, ftab, s.Name))) + ftab.SetUint32(ctxt.Arch, int64(start)+s.Value*4, uint32(ftabaddstring(ctxt, ftab, applyBuildPathPrefixMap(s.Name)))) } ftab.Size = int64(len(ftab.P))