From 298a131506ed23e830d14d0b18c02c5bdabef919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 30 Aug 2025 15:46:49 +0100
Subject: [PATCH] update obfuscatedImportPath list of skipped packages for Go
 1.25

New packages in Go's "allowAsmABIPkgs" list caused failures
in gogarble.txtar's use of `garble build std`.
---
 shared.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/shared.go b/shared.go
index 6507dd2..c986d9a 100644
--- a/shared.go
+++ b/shared.go
@@ -245,11 +245,16 @@ func (p *listedPackage) obfuscatedImportPath() string {
 	//   * reflect: its presence turns down dead code elimination
 	//   * embed: its presence enables using //go:embed
 	//   * others like syscall are allowed by import path to have more ABI tricks
-	//
-	// TODO: collect directly from cmd/internal/objabi/pkgspecial.go,
-	// in this particular case from allowAsmABIPkgs.
 	switch p.ImportPath {
-	case "runtime", "reflect", "embed", "syscall", "runtime/internal/startlinetest":
+	case "runtime", "reflect", "embed",
+		// TODO: collect directly from cmd/internal/objabi/pkgspecial.go,
+		// in this particular case from allowAsmABIPkgs.
+		"syscall",
+		"internal/bytealg",
+		"internal/chacha8rand",
+		"internal/runtime/syscall/linux",
+		"internal/runtime/syscall/windows",
+		"internal/runtime/startlinetest":
 		return p.ImportPath
 	}
 	// Intrinsics are matched by package import path as well.