Merge pull request #43475 from crazy-max/win-arm64

missing windows arm64 arch detection
This commit is contained in:
Sebastiaan van Stijn 2022-04-10 20:46:26 +02:00 committed by GitHub
commit c6872980bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -30,10 +30,11 @@ type systeminfo struct {
// Constants
const (
ProcessorArchitecture64 = 9 // PROCESSOR_ARCHITECTURE_AMD64
ProcessorArchitectureIA64 = 6 // PROCESSOR_ARCHITECTURE_IA64
ProcessorArchitecture32 = 0 // PROCESSOR_ARCHITECTURE_INTEL
ProcessorArchitectureArm = 5 // PROCESSOR_ARCHITECTURE_ARM
ProcessorArchitecture64 = 9 // PROCESSOR_ARCHITECTURE_AMD64
ProcessorArchitectureIA64 = 6 // PROCESSOR_ARCHITECTURE_IA64
ProcessorArchitecture32 = 0 // PROCESSOR_ARCHITECTURE_INTEL
ProcessorArchitectureArm = 5 // PROCESSOR_ARCHITECTURE_ARM
ProcessorArchitectureArm64 = 12 // PROCESSOR_ARCHITECTURE_ARM64
)
// runtimeArchitecture gets the name of the current architecture (x86, x86_64, …)
@ -47,8 +48,10 @@ func runtimeArchitecture() (string, error) {
return "i686", nil
case ProcessorArchitectureArm:
return "arm", nil
case ProcessorArchitectureArm64:
return "arm64", nil
default:
return "", fmt.Errorf("Unknown processor architecture")
return "", fmt.Errorf("unknown processor architecture %+v", sysinfo.wProcessorArchitecture)
}
}