release/dist/synology: add GOARM=7,softfloat mode for hi3535

Fixes #6860

Change-Id: I36f3101e75dab35d03e76693555ac93da893f8d5
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2026-05-27 10:54:15 -07:00
committed by Brad Fitzpatrick
parent 9be21088f4
commit f277bfb09d
4 changed files with 25 additions and 8 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"toolchain": { "toolchain": {
"rev": "e877d973840c91ec9d4bc1921b0845789de359ae", "rev": "7104161f96b07474ce312ea116c8b2a1efe1311a",
"sri": "sha256-HeD70CytKL0Ks/VDqMU73bN8fxpWkNc6mNgNr9PEO7k=" "sri": "sha256-uskKJHUzzIQ74VuzoQKrlz+6tCY/YKnv+BjJduPwt6Q="
}, },
"vendor": { "vendor": {
"goModSum": "sha256-EU/dC6ei0SKQJUBAkRseCLkaU2YLPS7EBJxCqXxEfm8=", "goModSum": "sha256-EU/dC6ei0SKQJUBAkRseCLkaU2YLPS7EBJxCqXxEfm8=",
+1 -1
View File
@@ -1 +1 @@
e877d973840c91ec9d4bc1921b0845789de359ae 7104161f96b07474ce312ea116c8b2a1efe1311a
+1 -1
View File
@@ -1 +1 @@
e877d973840c91ec9d4bc1921b0845789de359ae 7104161f96b07474ce312ea116c8b2a1efe1311a
+21 -4
View File
@@ -9,10 +9,6 @@ var v5Models = []string{
"armv5", "armv5",
"88f6281", "88f6281",
"88f6282", "88f6282",
// hi3535 is actually an armv7 under the hood, but with no
// hardware floating point. To the Go compiler, that means it's an
// armv5.
"hi3535",
} }
var v7Models = []string{ var v7Models = []string{
@@ -26,6 +22,13 @@ var v7Models = []string{
"monaco", "monaco",
} }
// These models are actually armv7 under the hood, but with no hardware
// floating point. To the Go compiler, that means we previously treated
// them as GOARM=5 just to get softfloat, but nowadays we can do GOARM=7,softfloat.
var v7SoftModels = []string{
"hi3535", // https://github.com/tailscale/tailscale/issues/6860
}
func Targets(forPackageCenter bool, signer dist.Signer) []dist.Target { func Targets(forPackageCenter bool, signer dist.Signer) []dist.Target {
var ret []dist.Target var ret []dist.Target
for _, dsmVersion := range []struct { for _, dsmVersion := range []struct {
@@ -105,6 +108,20 @@ func Targets(forPackageCenter bool, signer dist.Signer) []dist.Target {
signer: signer, signer: signer,
}) })
} }
for _, v7SoftArch := range v7SoftModels {
ret = append(ret, &target{
filenameArch: v7SoftArch,
dsmMajorVersion: dsmVersion.major,
dsmMinorVersion: dsmVersion.minor,
goenv: map[string]string{
"GOOS": "linux",
"GOARCH": "arm",
"GOARM": "7,softfloat",
},
packageCenter: forPackageCenter,
signer: signer,
})
}
} }
return ret return ret
} }