Commit 03a849f

committed

cgo/out: include path to line macros to avoid build tmp directory being embedded

When the external linker is used the work directory of the compiler is embedded into compressed sections of the LTO objects. Making them unreproducible between builds. The culprit seems to be fact that the line macros uses bare symbol names, and GCC prepends each symbol with current directory when compiling. These files are included when building the final build id stamped into the binary, thus they should be identical between builds. Reproduction of the issue: $ CGO_CFLAGS='-flto' go build -work -trimpath -ldflags '-linkmode=external' main.go WORK=/tmp/go-build2408155205 $ cd /tmp/go-build2408155205/b001 $ objdump -h ./_x002.o | grep GoStringLen 7 .gnu.lto__GoStringLen.0.6b7d5558e3553715 0000013b 0000000000000000 0000000000000000 0000009c 2**0 $ objcopy ./_x002.o /dev/null --dump-section .gnu.lto__GoStringLen.0.6b7d5558e3553715=GoStringLen.zst $ unzstd ./GoStringLen.zst $ strings GoStringLen /tmp/go-build2408155205/b001 cgo-builtin-prolog

1 parent d15515a commit 03a849fCopy full SHA for 03a849f

File tree

1 file changed

-7

lines changed

src/cmd/cgo
- out.go

1 file changed

-7

lines changed

`‎src/cmd/cgo/out.go`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1471,7 +1471,7 @@ func (p Package) cgoType(e ast.Expr) Type {`
`1471`	`1471`	`}`
`1472`	`1472`
`1473`	`1473`	const gccProlog = `
`1474`		`-#line 1 "cgo-gcc-prolog"`
	`1474`	`+#line 1 "/cgo-gcc-prolog"`
`1475`	`1475`	`/*`
`1476`	`1476`	`If x and y are not equal, the type will be invalid`
`1477`	`1477`	`(have a negative array count) and an inscrutable error will come`
@@ -1535,7 +1535,7 @@ const noTsanProlog = `
`1535`	`1535`	`// it is more important to avoid false positives, which reduce confidence`
`1536`	`1536`	`// in the tool, than to avoid false negatives.`
`1537`	`1537`	const yesTsanProlog = `
`1538`		`-#line 1 "cgo-tsan-prolog"`
	`1538`	`+#line 1 "/cgo-tsan-prolog"`
`1539`	`1539`	`#define CGO_NO_SANITIZE_THREAD __attribute__ ((no_sanitize_thread))`
`1540`	`1540`
`1541`	`1541`	`long long _cgo_sync __attribute__ ((common));`
`@@ -1577,7 +1577,7 @@ extern void __msan_unpoison(const volatile void *, size_t);`
`1577`	`1577`	`var msanProlog = noMsanProlog`
`1578`	`1578`
`1579`	`1579`	const builtinProlog = `
`1580`		`-#line 1 "cgo-builtin-prolog"`
	`1580`	`+#line 1 "/cgo-builtin-prolog"`
`1581`	`1581`	`#include <stddef.h>`
`1582`	`1582`
`1583`	`1583`	`/* Define intgo when compiling with GCC. */`
`@@ -1766,7 +1766,7 @@ func (p *Package) cPrologGccgo() string {`
`1766`	`1766`	`}`
`1767`	`1767`
`1768`	`1768`	const cPrologGccgo = `
`1769`		`-#line 1 "cgo-c-prolog-gccgo"`
	`1769`	`+#line 1 "/cgo-c-prolog-gccgo"`
`1770`	`1770`	`#include <stdint.h>`
`1771`	`1771`	`#include <stdlib.h>`
`1772`	`1772`	`#include <string.h>`
`@@ -1873,7 +1873,7 @@ void localCgoCheckResult(Eface val) {`
`1873`	`1873`	`// error if a Go file with a cgo comment #include's the export header`
`1874`	`1874`	`// generated by a different package.`
`1875`	`1875`	const builtinExportProlog = `
`1876`		`-#line 1 "cgo-builtin-export-prolog"`
	`1876`	`+#line 1 "/cgo-builtin-export-prolog"`
`1877`	`1877`
`1878`	`1878`	`#include <stddef.h>`
`1879`	`1879`
`@@ -1906,7 +1906,7 @@ func (p *Package) gccExportHeaderProlog() string {`
`1906`	`1906`	`// difference, as Go code never wants to refer to the latter meaning.`
`1907`	`1907`	const gccExportHeaderProlog = `
`1908`	`1908`	`/* Start of boilerplate cgo prologue. */`
`1909`		`-#line 1 "cgo-gcc-export-header-prolog"`
	`1909`	`+#line 1 "/cgo-gcc-export-header-prolog"`
`1910`	`1910`
`1911`	`1911`	`#ifndef GO_CGO_PROLOGUE_H`
`1912`	`1912`	`#define GO_CGO_PROLOGUE_H`
@@ -1968,7 +1968,7 @@ const gccExportHeaderEpilog = `
`1968`	`1968`	`// We use weak declarations, and test the addresses, so that this code`
`1969`	`1969`	`// works with older versions of gccgo.`
`1970`	`1970`	const gccgoExportFileProlog = `
`1971`		`-#line 1 "cgo-gccgo-export-file-prolog"`
	`1971`	`+#line 1 "/cgo-gccgo-export-file-prolog"`
`1972`	`1972`	`extern _Bool runtime_iscgo __attribute__ ((weak));`
`1973`	`1973`
`1974`	`1974`	`static void GoInit(void) __attribute__ ((constructor));`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 03a849f

File tree

1 file changed

1 file changed

`‎src/cmd/cgo/out.go`

0 commit comments