Skip to content

Commit 30c8d95

Browse files
committed
add stub syscallN for unsupported arches
1 parent 04f172f commit 30c8d95

File tree

1 file changed

+30
-8
lines changed

1 file changed

+30
-8
lines changed

patches/0001-Vendor-external-dependencies.patch

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ Use a 'go' that was recently built by the current branch to ensure stable result
189189
.../go-crypto-darwin/internal/xsyscall/dl.h | 15 +
190190
.../internal/xsyscall/syscall_nocgo.go | 88 +
191191
.../internal/xsyscall/syscall_nocgo_darwin.go | 25 +
192+
.../internal/xsyscall/syscall_nocgo_others.go | 14 +
192193
.../internal/xsyscall/xsyscall.go | 6 +
193194
.../go-crypto-darwin/internal/xsyscall/zdl.s | 54 +
194195
.../internal/xsyscall/zdl_nocgo.go | 48 +
@@ -241,7 +242,7 @@ Use a 'go' that was recently built by the current branch to ensure stable result
241242
.../internal/subtle/aliasing.go | 32 +
242243
.../internal/sysdll/sys_windows.go | 55 +
243244
src/vendor/modules.txt | 23 +
244-
233 files changed, 30516 insertions(+), 7 deletions(-)
245+
234 files changed, 30530 insertions(+), 7 deletions(-)
245246
create mode 100644 src/cmd/internal/telemetry/counter/deps_ignore.go
246247
create mode 100644 src/cmd/vendor/github.com/microsoft/go-infra/telemetry/LICENSE
247248
create mode 100644 src/cmd/vendor/github.com/microsoft/go-infra/telemetry/README.md
@@ -416,6 +417,7 @@ Use a 'go' that was recently built by the current branch to ensure stable result
416417
create mode 100644 src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/dl.h
417418
create mode 100644 src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/syscall_nocgo.go
418419
create mode 100644 src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/syscall_nocgo_darwin.go
420+
create mode 100644 src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/syscall_nocgo_others.go
419421
create mode 100644 src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/xsyscall.go
420422
create mode 100644 src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/zdl.s
421423
create mode 100644 src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/zdl_nocgo.go
@@ -2128,7 +2130,7 @@ index 00000000000000..ae4055d2d71303
21282130
+// that are used by the backend package. This allows to track
21292131
+// their versions in a single patch file.
21302132
diff --git a/src/go.mod b/src/go.mod
2131-
index efc07451b53448..e31efae65705c0 100644
2133+
index efc07451b53448..4e945511073ecc 100644
21322134
--- a/src/go.mod
21332135
+++ b/src/go.mod
21342136
@@ -11,3 +11,9 @@ require (
@@ -2138,18 +2140,18 @@ index efc07451b53448..e31efae65705c0 100644
21382140
+
21392141
+require (
21402142
+ github.com/golang-fips/openssl/v2 v2.0.4-0.20251205103838-300bb5780a83
2141-
+ github.com/microsoft/go-crypto-darwin v0.0.3-0.20251215134426-d7fa8738280f
2143+
+ github.com/microsoft/go-crypto-darwin v0.0.3-0.20251215143607-e068212c5cff
21422144
+ github.com/microsoft/go-crypto-winnative v0.0.0-20251202082756-9cab7d2d4a79
21432145
+)
21442146
diff --git a/src/go.sum b/src/go.sum
2145-
index b6b841b44d8e38..472a3410927490 100644
2147+
index b6b841b44d8e38..e42e19781dd7f2 100644
21462148
--- a/src/go.sum
21472149
+++ b/src/go.sum
21482150
@@ -1,3 +1,9 @@
21492151
+github.com/golang-fips/openssl/v2 v2.0.4-0.20251205103838-300bb5780a83 h1:u3WAHp425YzcHygZORNJa9dkyA959Gtti8bUgGYYuiA=
21502152
+github.com/golang-fips/openssl/v2 v2.0.4-0.20251205103838-300bb5780a83/go.mod h1:EtVnMfLGkB4pihGOH+tXEV0WlXxewWdT1n3GLJEHvpw=
2151-
+github.com/microsoft/go-crypto-darwin v0.0.3-0.20251215134426-d7fa8738280f h1:Uj26IA3n2m2NWM/IaYpjyVEoF50KrZmK2wXUDoDsxew=
2152-
+github.com/microsoft/go-crypto-darwin v0.0.3-0.20251215134426-d7fa8738280f/go.mod h1:MTii5PQwRlfUjYpGoF8CPLGwXSHTbLHGRN9FVNML5N0=
2153+
+github.com/microsoft/go-crypto-darwin v0.0.3-0.20251215143607-e068212c5cff h1:oerudO/EXeLnT69uP9hbjqwCBZ5RuIwF02vkCOY1nBs=
2154+
+github.com/microsoft/go-crypto-darwin v0.0.3-0.20251215143607-e068212c5cff/go.mod h1:MTii5PQwRlfUjYpGoF8CPLGwXSHTbLHGRN9FVNML5N0=
21532155
+github.com/microsoft/go-crypto-winnative v0.0.0-20251202082756-9cab7d2d4a79 h1:u3ZftMj7JpCAl4Ku8LUngqfn7pNuQG9mAsNMlSjBvDI=
21542156
+github.com/microsoft/go-crypto-winnative v0.0.0-20251202082756-9cab7d2d4a79/go.mod h1:gD686525Li/blRSYwSzFJ6/LJQVFJp7Y0MKp+dmqFbc=
21552157
golang.org/x/crypto v0.46.1-0.20251210140736-7dacc380ba00 h1:JgcPM1rzpSOZS8y69FQvnY0xN0ciHlpQqwTXJcuZIA4=
@@ -26620,6 +26622,26 @@ index 00000000000000..c7e683e6790a27
2662026622
+ }
2662126623
+ return uintptr(r0)
2662226624
+}
26625+
diff --git a/src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/syscall_nocgo_others.go b/src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/syscall_nocgo_others.go
26626+
new file mode 100644
26627+
index 00000000000000..28dba16a23340e
26628+
--- /dev/null
26629+
+++ b/src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/syscall_nocgo_others.go
26630+
@@ -0,0 +1,14 @@
26631+
+// Copyright (c) Microsoft Corporation.
26632+
+// Licensed under the MIT License.
26633+
+
26634+
+//go:build !cgo && !(amd64 || arm64)
26635+
+
26636+
+package xsyscall
26637+
+
26638+
+// Implement a mock version of SyscallN for unsupported architectures.
26639+
+// This will simply panic to indicate that the syscall is not supported.
26640+
+
26641+
+//go:nosplit
26642+
+func SyscallN(errType uintptr, fn uintptr, args ...uintptr) (r1, r2 uintptr) {
26643+
+ panic("SyscallN is not supported on this architecture")
26644+
+}
2662326645
diff --git a/src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/xsyscall.go b/src/vendor/github.com/microsoft/go-crypto-darwin/internal/xsyscall/xsyscall.go
2662426646
new file mode 100644
2662526647
index 00000000000000..458053d55e4541
@@ -34362,7 +34384,7 @@ index 00000000000000..1722410e5af193
3436234384
+ return getSystemDirectory() + "\\" + dll
3436334385
+}
3436434386
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
34365-
index b6f6376eac041a..adca7d77fdd0e4 100644
34387+
index b6f6376eac041a..94f52f58126855 100644
3436634388
--- a/src/vendor/modules.txt
3436734389
+++ b/src/vendor/modules.txt
3436834390
@@ -1,3 +1,26 @@
@@ -34373,7 +34395,7 @@ index b6f6376eac041a..adca7d77fdd0e4 100644
3437334395
+github.com/golang-fips/openssl/v2/internal/fakecgo
3437434396
+github.com/golang-fips/openssl/v2/internal/ossl
3437534397
+github.com/golang-fips/openssl/v2/osslsetup
34376-
+# github.com/microsoft/go-crypto-darwin v0.0.3-0.20251215134426-d7fa8738280f
34398+
+# github.com/microsoft/go-crypto-darwin v0.0.3-0.20251215143607-e068212c5cff
3437734399
+## explicit; go 1.24
3437834400
+github.com/microsoft/go-crypto-darwin/bbig
3437934401
+github.com/microsoft/go-crypto-darwin/internal/commoncrypto

0 commit comments

Comments
 (0)