Control: tags -1 patch Hi,
I backported the upstream commit that solves the issue and tested it (by building the package, then rebuilding the Go compiler and standard library using the produced compiler). This would allow us to make progress on reproducible builds for all Golang binary package now, rather than waiting for Golang 1.7 to land. Would this be acceptable for inclusion? Best, nicoo On Mon, May 23, 2016 at 09:56:25AM +1200, Michael Hudson-Doyle wrote: > That upload does not contain the fix. Need to wait for 1.7. > > Cheers, > mwh
From 4994af5e5f2020fdfade632e238fe263ac799fc9 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni <[email protected]> Date: Wed, 6 Jul 2016 18:51:41 +0200 Subject: [PATCH 1/2] Make builds deterministic --- ...cmd-go-cmd-link-make-builds-deterministic.patch | 151 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 152 insertions(+) create mode 100644 debian/patches/0001-cmd-go-cmd-link-make-builds-deterministic.patch diff --git a/debian/patches/0001-cmd-go-cmd-link-make-builds-deterministic.patch b/debian/patches/0001-cmd-go-cmd-link-make-builds-deterministic.patch new file mode 100644 index 0000000..5f9ba39 --- /dev/null +++ b/debian/patches/0001-cmd-go-cmd-link-make-builds-deterministic.patch @@ -0,0 +1,151 @@ +From: Nicolas Braud-Santoni <[email protected]> +Date: Wed, 6 Jul 2016 18:50:31 +0200 +Subject: cmd/go, cmd/link: make builds deterministic + +Add the following flags when supported by the compiler: + -gno-record-gcc-switches + -fdebug-prefix-map=$WORK=/tmp/go-build + +Add an empty NAME symbol to the ELF .symtab. GNU ld will add a NAME +symbol when one is not present; including one of our own prevents it +from adding a reference to the link tempdir. + +Fixes #13247 for compilers that support -fdebug-prefix-map. (gcc, clang +in the near future.) + +Change-Id: I221c71fc59cd23ee8c99bcc038793ff4623c9ffc +Reviewed-on: https://go-review.googlesource.com/19363 +Reviewed-by: Ian Lance Taylor <[email protected]> +Run-TryBot: Damien Neil <[email protected]> +Applied-Upstream: https://github.com/golang/go/commit/5bbb98df0960f57dca73cb7640456608d4cc0917 +--- + src/cmd/go/build.go | 40 ++++++++++++++++++++++++++------------ + src/cmd/go/go_test.go | 27 +++++++++++++++++++++++++ + src/cmd/link/internal/ld/symtab.go | 5 +++++ + 3 files changed, 60 insertions(+), 12 deletions(-) + +diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go +index f2a2a60..1932f32 100644 +--- a/src/cmd/go/build.go ++++ b/src/cmd/go/build.go +@@ -686,6 +686,7 @@ type builder struct { + work string // the temporary work directory (ends in filepath.Separator) + actionCache map[cacheKey]*action // a cache of already-constructed actions + mkdirCache map[string]bool // a cache of created directories ++ flagCache map[string]bool // a cache of supported compiler flags + print func(args ...interface{}) (int, error) + + output sync.Mutex +@@ -2927,6 +2928,14 @@ func (b *builder) ccompilerCmd(envvar, defcmd, objdir string) []string { + // disable word wrapping in error messages + a = append(a, "-fmessage-length=0") + ++ // Tell gcc not to include the work directory in object files. ++ if b.gccSupportsFlag("-fdebug-prefix-map=a=b") { ++ // -gno-record-gcc-switches is supported by all gcc/clang ++ // versions that support -fdebug-prefix-map. ++ a = append(a, "-gno-record-gcc-switches") ++ a = append(a, "-fdebug-prefix-map="+b.work+"=/tmp/go-build") ++ } ++ + // On OS X, some of the compilers behave as if -fno-common + // is always set, and the Mach-O linker in 6l/8l assumes this. + // See https://golang.org/issue/3253. +@@ -2941,19 +2950,24 @@ func (b *builder) ccompilerCmd(envvar, defcmd, objdir string) []string { + // -no-pie must be passed when doing a partial link with -Wl,-r. But -no-pie is + // not supported by all compilers. + func (b *builder) gccSupportsNoPie() bool { +- if goos != "linux" { +- // On some BSD platforms, error messages from the +- // compiler make it to the console despite cmd.Std* +- // all being nil. As -no-pie is only required on linux +- // systems so far, we only test there. +- return false ++ return b.gccSupportsFlag("-no-pie") ++} ++ ++// gccSupportsFlag checks to see if the compiler supports a flag. ++func (b *builder) gccSupportsFlag(flag string) bool { ++ b.exec.Lock() ++ defer b.exec.Unlock() ++ if b, ok := b.flagCache[flag]; ok { ++ return b + } +- src := filepath.Join(b.work, "trivial.c") +- if err := ioutil.WriteFile(src, []byte{}, 0666); err != nil { +- return false ++ if b.flagCache == nil { ++ src := filepath.Join(b.work, "trivial.c") ++ if err := ioutil.WriteFile(src, []byte{}, 0666); err != nil { ++ return false ++ } ++ b.flagCache = make(map[string]bool) + } +- cmdArgs := b.gccCmd(b.work) +- cmdArgs = append(cmdArgs, "-no-pie", "-c", "trivial.c") ++ cmdArgs := append(envList("CC", defaultCC), flag, "-c", "trivial.c") + if buildN || buildX { + b.showcmd(b.work, "%s", joinUnambiguously(cmdArgs)) + if buildN { +@@ -2964,7 +2978,9 @@ func (b *builder) gccSupportsNoPie() bool { + cmd.Dir = b.work + cmd.Env = envForDir(cmd.Dir, os.Environ()) + out, err := cmd.CombinedOutput() +- return err == nil && !bytes.Contains(out, []byte("unrecognized")) ++ supported := err == nil && !bytes.Contains(out, []byte("unrecognized")) ++ b.flagCache[flag] = supported ++ return supported + } + + // gccArchArgs returns arguments to pass to gcc based on the architecture. +diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go +index acf4a39..8851b3e 100644 +--- a/src/cmd/go/go_test.go ++++ b/src/cmd/go/go_test.go +@@ -2771,3 +2771,30 @@ func TestGoGetUpdateAllDoesNotTryToLoadDuplicates(t *testing.T) { + tg.run("get", "-u", ".../") + tg.grepStderrNot("duplicate loads of", "did not remove old packages from cache") + } ++ ++func TestCgoConsistentResults(t *testing.T) { ++ if !canCgo { ++ t.Skip("skipping because cgo not enabled") ++ } ++ ++ tg := testgo(t) ++ defer tg.cleanup() ++ tg.parallel() ++ tg.makeTempdir() ++ tg.setenv("GOPATH", filepath.Join(tg.pwd(), "testdata")) ++ exe1 := tg.path("cgotest1" + exeSuffix) ++ exe2 := tg.path("cgotest2" + exeSuffix) ++ tg.run("build", "-o", exe1, "cgotest") ++ tg.run("build", "-x", "-o", exe2, "cgotest") ++ b1, err := ioutil.ReadFile(exe1) ++ tg.must(err) ++ b2, err := ioutil.ReadFile(exe2) ++ tg.must(err) ++ ++ if !tg.doGrepMatch(`-fdebug-prefix-map=\$WORK`, &tg.stderr) { ++ t.Skip("skipping because C compiler does not support -fdebug-prefix-map") ++ } ++ if !bytes.Equal(b1, b2) { ++ t.Error("building cgotest twice did not produce the same output") ++ } ++} +diff --git a/src/cmd/link/internal/ld/symtab.go b/src/cmd/link/internal/ld/symtab.go +index 3e6169e..b87ca81 100644 +--- a/src/cmd/link/internal/ld/symtab.go ++++ b/src/cmd/link/internal/ld/symtab.go +@@ -215,6 +215,11 @@ func Asmelfsym() { + + dwarfaddelfsectionsyms() + ++ // Some linkers will add a FILE sym if one is not present. ++ // Avoid having the working directory inserted into the symbol table. ++ putelfsyment(0, 0, 0, STB_LOCAL<<4|STT_FILE, SHN_ABS, 0) ++ numelfsym++ ++ + elfbind = STB_LOCAL + genasmsym(putelfsym) + diff --git a/debian/patches/series b/debian/patches/series index e69de29..8d6f874 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-cmd-go-cmd-link-make-builds-deterministic.patch -- 2.8.1 From 35d864797339ad893ffa0f54f91820985ee1b8ac Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni <[email protected]> Date: Wed, 6 Jul 2016 19:09:04 +0200 Subject: [PATCH 2/2] Update changelog --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0b09e52..19ff2e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ golang-1.6 (1.6.2-3) UNRELEASED; urgency=medium + [ Paul Tagliamonte ] * Team upload. * Use a secure transport for the Vcs-Git and Vcs-Browser URL + [ Nicolas Braud-Santoni ] + * Backport upstream deterministic builds commit (Closes: #824806) + -- Paul Tagliamonte <[email protected]> Wed, 29 Jun 2016 20:20:49 -0400 golang-1.6 (1.6.2-2) unstable; urgency=medium -- 2.8.1
signature.asc
Description: PGP signature
