[Pkg-golang-commits] [golang] 02/04: refresh and reenable 0002-reproducible-BUILD_PATH_PREFIX_MAP.patch
Michael Hudson-Doyle
mwhudson-guest at moszumanska.debian.org
Wed Jan 31 01:49:46 UTC 2018
This is an automated email from the git hooks/post-receive script.
mwhudson-guest pushed a commit to branch golang-1.10
in repository golang.
commit 764787416b5114efccfdae76d3698d56cdc1e2dd
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date: Wed Jan 31 11:39:07 2018 +1300
refresh and reenable 0002-reproducible-BUILD_PATH_PREFIX_MAP.patch
---
debian/changelog | 8 ++-
.../0002-reproducible-BUILD_PATH_PREFIX_MAP.patch | 68 +++++++++-------------
debian/patches/series | 2 +-
3 files changed, 34 insertions(+), 44 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 87f5552..3a397a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
golang-1.10 (1.10~rc1-1) UNRELEASED; urgency=medium
- * New upstream version 1.10~rc1
- * Disable 0002-reproducible-BUILD_PATH_PREFIX_MAP.patch for now. Remove all
- other patches.
+ * New upstream version 1.10~rc1.
+ * d/patches/0004-cmd-dist-use-buildmode-pie-for-pie-testing.patch,
+ d/patches/0006-misc-cgo-testcarchive-use-no-pie-where-needed.patch,
+ d/patches/0003-Do-not-use-SP-as-index-reg.patch: removed, included upstream.
+ * d/patches/0002-reproducible-BUILD_PATH_PREFIX_MAP.patch: refreshed.
* d/patches/0001-os-signal-skip-TestTerminalSignal-if-posix_openpt-fa.patch:
Add to fix test failure in chroot.
* d/patches/0003-cmd-vendor-github.com-google-pprof-cherry-pick-fix-t.patch:
diff --git a/debian/patches/0002-reproducible-BUILD_PATH_PREFIX_MAP.patch b/debian/patches/0002-reproducible-BUILD_PATH_PREFIX_MAP.patch
index d12d206..8c12cc8 100644
--- a/debian/patches/0002-reproducible-BUILD_PATH_PREFIX_MAP.patch
+++ b/debian/patches/0002-reproducible-BUILD_PATH_PREFIX_MAP.patch
@@ -5,25 +5,20 @@ Last-Update: 2017-08-25
---
-diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go
-index 7d667ff552..4eaef74817 100644
---- a/src/cmd/go/internal/work/build.go
-+++ b/src/cmd/go/internal/work/build.go
-@@ -2559,7 +2559,10 @@ func (gcToolchain) ld(b *Builder, root *Action, out string, allactions []*Action
+--- a/src/cmd/go/internal/work/gc.go
++++ b/src/cmd/go/internal/work/gc.go
+@@ -456,7 +456,10 @@
dir, out = filepath.Split(out)
}
-- return b.run(dir, root.Package.ImportPath, nil, cfg.BuildToolexec, base.Tool("link"), "-o", out, importArgs, ldflags, mainpkg)
+- 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(dir, root.Package.ImportPath, env, cfg.BuildToolexec, base.Tool("link"), "-o", out, importArgs, ldflags, mainpkg)
++ 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, toplevelactions []*Action, out 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 0000000000..8cda8a5f54
+ func (gcToolchain) ldShared(b *Builder, root *Action, toplevelactions []*Action, out, importcfg string, allactions []*Action) error {
--- /dev/null
+++ b/src/cmd/link/internal/ld/buildpathprefix.go
@@ -0,0 +1,56 @@
@@ -83,50 +78,43 @@ index 0000000000..8cda8a5f54
+ }
+ return dir
+}
-diff --git a/src/cmd/link/internal/ld/dwarf.go b/src/cmd/link/internal/ld/dwarf.go
-index ba8ace54c8..01c36ef039 100644
--- a/src/cmd/link/internal/ld/dwarf.go
+++ b/src/cmd/link/internal/ld/dwarf.go
-@@ -1022,7 +1022,7 @@ func writelines(ctxt *Link, syms []*Symbol) ([]*Symbol, []*Symbol) {
- newattr(dwinfo, dwarf.DW_AT_stmt_list, dwarf.DW_CLS_PTR, 0, linesec)
- newattr(dwinfo, dwarf.DW_AT_low_pc, dwarf.DW_CLS_ADDRESS, s.Value, s)
+@@ -1131,7 +1131,7 @@
+ 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())
- newattr(dwinfo, dwarf.DW_AT_comp_dir, dwarf.DW_CLS_STRING, int64(len(compDir)), compDir)
- producer := "Go cmd/compile " + objabi.Version
- newattr(dwinfo, dwarf.DW_AT_producer, dwarf.DW_CLS_STRING, int64(len(producer)), producer)
-@@ -1055,7 +1055,7 @@ func writelines(ctxt *Link, syms []*Symbol) ([]*Symbol, []*Symbol) {
- Adduint8(ctxt, ls, 0) // include_directories (empty)
-
- for _, f := range ctxt.Filesyms {
-- Addstring(ls, f.Name)
-+ Addstring(ls, applyBuildPathPrefixMap(f.Name))
- Adduint8(ctxt, ls, 0)
- Adduint8(ctxt, ls, 0)
- Adduint8(ctxt, ls, 0)
-diff --git a/src/cmd/link/internal/ld/pcln.go b/src/cmd/link/internal/ld/pcln.go
-index 1f6aed3f71..ba6a440a12 100644
+ // 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 @@
+ }
+ // 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)
--- a/src/cmd/link/internal/ld/pcln.go
+++ b/src/cmd/link/internal/ld/pcln.go
-@@ -300,7 +300,7 @@ func (ctxt *Link) pclntab() {
- off = int32(setaddr(ctxt, ftab, int64(off), s))
+@@ -301,7 +301,7 @@
+ off = int32(ftab.SetAddr(ctxt.Arch, int64(off), s))
// name int32
- nameoff := nameToOffset(s.Name)
+ nameoff := nameToOffset(applyBuildPathPrefixMap(s.Name))
- off = int32(setuint32(ctxt, ftab, int64(off), uint32(nameoff)))
+ off = int32(ftab.SetUint32(ctxt.Arch, int64(off), uint32(nameoff)))
// args int32
-@@ -410,7 +410,7 @@ func (ctxt *Link) pclntab() {
- setuint32(ctxt, ftab, int64(start), uint32(len(ctxt.Filesyms)+1))
+@@ -411,7 +411,7 @@
+ ftab.SetUint32(ctxt.Arch, int64(start), uint32(len(ctxt.Filesyms)+1))
for i := len(ctxt.Filesyms) - 1; i >= 0; i-- {
s := ctxt.Filesyms[i]
-- setuint32(ctxt, ftab, int64(start)+s.Value*4, uint32(ftabaddstring(ctxt, ftab, s.Name)))
-+ setuint32(ctxt, ftab, int64(start)+s.Value*4, uint32(ftabaddstring(ctxt, ftab, applyBuildPathPrefixMap(s.Name))))
+- 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))
---
-2.13.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 850d72d..aa84d76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
0001-os-signal-skip-TestTerminalSignal-if-posix_openpt-fa.patch
-#0002-reproducible-BUILD_PATH_PREFIX_MAP.patch
+0002-reproducible-BUILD_PATH_PREFIX_MAP.patch
0003-cmd-vendor-github.com-google-pprof-cherry-pick-fix-t.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git
More information about the pkg-golang-commits
mailing list