mirror of
https://github.com/burrowers/garble.git
synced 2025-09-26 20:01:16 +08:00
aed2fd2659
While strictly speaking it would be okay to leave Go 1.24 support in place for the time being, we are behind on a few tasks at the moment so it's best to keep the setup at master simpler for the next release. Go 1.25 already came out two weeks ago, and it seems to have been a fairly smooth release, so I don't suspect any end users will have trouble upgrading to it. Note that two changes were necessary for garble to work on Go 1.25.0. First, we stop deduplicating runtimeAndLinknamed with runtimeAndDeps. Otherwise, for GOOS=windows, internal/runtime/cgroup would be missing as it is a //go:linkname target from runtime on all platforms, but it is not transitively imported from runtime on GOOS=windows. Second, the testing/synctest package is now part of std, and it is a //go:linkname target from the testing package but not a transitive import from it. Teach appendListedPackages that, when loading all packages for a `go test` run, it should load the new testing/synctest package too. Fixes #968.
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From 1eb3d02d33155831067ca7db2c6517108c4305ae Mon Sep 17 00:00:00 2001
|
|
From: pagran <pagran@protonmail.com>
|
|
Date: Mon, 9 Jan 2023 13:30:00 +0100
|
|
Subject: [PATCH 1/3] add custom magic value
|
|
|
|
---
|
|
cmd/link/internal/ld/pcln.go | 17 +++++++++++++++++
|
|
1 file changed, 17 insertions(+)
|
|
|
|
diff --git a/cmd/link/internal/ld/pcln.go b/cmd/link/internal/ld/pcln.go
|
|
index ea08fd3d31..7bae9f18c5 100644
|
|
--- a/cmd/link/internal/ld/pcln.go
|
|
+++ b/cmd/link/internal/ld/pcln.go
|
|
@@ -4,6 +4,10 @@
|
|
|
|
package ld
|
|
|
|
+import (
|
|
+ "os"
|
|
+)
|
|
+
|
|
import (
|
|
"cmd/internal/goobj"
|
|
"cmd/internal/objabi"
|
|
@@ -262,6 +266,19 @@ func (state *pclntab) generatePCHeader(ctxt *Link) {
|
|
if off != size {
|
|
panic(fmt.Sprintf("pcHeader size: %d != %d", off, size))
|
|
}
|
|
+
|
|
+ // Use garble prefix in variable names to minimize collision risk
|
|
+ garbleMagicStr := os.Getenv("GARBLE_LINK_MAGIC")
|
|
+ if garbleMagicStr == "" {
|
|
+ panic("[garble] magic value must be set")
|
|
+ }
|
|
+ var garbleMagicVal uint32
|
|
+ // Use fmt package instead of strconv to avoid importing a new package
|
|
+ if _, err := fmt.Sscan(garbleMagicStr, &garbleMagicVal); err != nil {
|
|
+ panic(fmt.Errorf("[garble] invalid magic value %s: %v", garbleMagicStr, err))
|
|
+ }
|
|
+
|
|
+ header.SetUint32(ctxt.Arch, 0, garbleMagicVal)
|
|
}
|
|
|
|
state.pcheader = state.addGeneratedSym(ctxt, "runtime.pcheader", size, writeHeader)
|
|
--
|
|
2.48.1
|
|
|