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

missing windows arm64 arch detection
moby · Apr 10, 2022 · c687298 · c687298
2 parents 5179299 + 5d9e99e
commit c687298
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/pkg/platform/architecture_windows.go b/pkg/platform/architecture_windows.go
@@ -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)
 	}
 }