Merge branch '7.0' of https://github.com/epics-base/epics-base into rtems5

2021-02-25 14:06:41 -06:00
parent 35ec367eac 5593103c11
commit e2d37bc70d
38 changed files with 984 additions and 610 deletions
@@ -46,8 +46,9 @@ sub HostArch {
        my ($kernel, $hostname, $release, $version, $cpu) = uname;
        if (m/^darwin/) {
            for ($cpu) {
-                return 'darwin-x86' if m/^(i386|x86_64)/;
-                return 'darwin-ppc' if m/Power Macintosh/;
+                return 'darwin-x86'     if m/^(i386|x86_64)/;
+                return 'darwin-ppc'     if m/Power Macintosh/;
+                return 'darwin-aarch64' if m/arm64/;
            }
            die "$0: macOS CPU type '$cpu' not recognized\n";
        }