Merge branch 'master' into pybuffer2

filmor · web-flow · commit 98dff2c84aae · 2019-11-14T07:15:19.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 
 -   Added automatic NuGet package generation in appveyor and local builds
 -   Added function that sets Py_NoSiteFlag to 1.
+-   Added support for Jetson Nano.
 -   Added Python 3 buffer api support and PyBuffer interface for fast byte and numpy array read/write ([#980][p980])
 
 ### Changed
diff --git a/src/runtime/platform/Types.cs b/src/runtime/platform/Types.cs
@@ -6,6 +6,7 @@ public enum MachineType
         x86_64,
         armv7l,
         armv8,
+        aarch64,
         Other
     };
 
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -143,6 +143,7 @@ public class Runtime
             ["em64t"] = MachineType.x86_64,
             ["armv7l"] = MachineType.armv7l,
             ["armv8"] = MachineType.armv8,
+            ["aarch64"] = MachineType.aarch64,
         };
 
         /// <summary>

-Original file line number
+Diff line change
         x86_64,
         armv7l,
         armv8,
 +        aarch64,
         Other
     };