Merge ~jeonghanlee/epics-base:darwin-aarch64 into ~epics-core/epics-base/+git/epics-base:7.0

[Andrew Johnson]

Han's branch adds configuration files for a new target darwin-aarch64 to support Apple's new M1 CPUs.

[Andrew Johnson (anj)]

There are a couple of typo's in here that I would clean up when merging; ppc is mentioned in a comment.

One thing I'd like to to discuss is whether we want to add another target for building universal binaries containing both x86 and arm code. The build system supported that for ppc+x86 (see configure/os/CONFIG_SITE.Common.darwin-ppcx86) so the same approach should still work for x86+arm, but we should probably use a more generic target name though, darwin-any, darwin-multi, darwin-all, ...?

[Han (jeonghanlee)]

There are two outputs of `uname -ar` on the Apple M1. I can compile the EPICS base according to my shell environment, for example, Iterm2 and a terminal within the VS Code. The first one is the output of Iterm2 and the second is the output of the VS Code terminal.

1) Darwin JeongLee-M70.local 20.3.0 Darwin Kernel Version 20.3.0: Thu Jan 21 00:06:51 PST 2021; root:xnu-7195.81.3~1/RELEASE_ARM64_T8101 arm64

2) Darwin JeongLee-M70.local 20.3.0 Darwin Kernel Version 20.3.0: Thu Jan 21 00:06:51 PST 2021; root:xnu-7195.81.3~1/RELEASE_ARM64_T8101 x86_64

Hope this help to your decision just in case.

[Han (jeonghanlee)]

> There are two outputs of `uname -ar` on the Apple M1. I can compile the EPICS
> base according to my shell environment, for example, Iterm2 and a terminal
> within the VS Code. The first one is the output of Iterm2 and the second is
> the output of the VS Code terminal.
>
> 1) Darwin JeongLee-M70.local 20.3.0 Darwin Kernel Version 20.3.0: Thu Jan 21
> 00:06:51 PST 2021; root:xnu-7195.81.3~1/RELEASE_ARM64_T8101 arm64
>
> 2) Darwin JeongLee-M70.local 20.3.0 Darwin Kernel Version 20.3.0: Thu Jan 21
> 00:06:51 PST 2021; root:xnu-7195.81.3~1/RELEASE_ARM64_T8101 x86_64
>
> Hope this help to your decision just in case.

Case 2) works with the current EPICS building system without any modification. And this branch is for Case 1).

[Han (jeonghanlee)]

> There are a couple of typo's in here that I would clean up when merging; ppc
> is mentioned in a comment.

I only found one typo, if you let me know others, I can update the repo again.

> One thing I'd like to to discuss is whether we want to add another target for
> building universal binaries containing both x86 and arm code. The build system
> supported that for ppc+x86 (see configure/os/CONFIG_SITE.Common.darwin-ppcx86)
> so the same approach should still work for x86+arm, but we should probably use
> a more generic target name though, darwin-any, darwin-multi, darwin-all, ...?

[Andrew Johnson (anj)]

Found it, the other typo was in your commit log-message (dawrin) which I don't expect you to fix.

This looks good enough for now, thanks Han! I will merge it before the next release.

I wonder when GitHub will make builders available for this architecture?

review: Approve

diff --git a/configure/os/CONFIG.Common.darwin-aarch64 b/configure/os/CONFIG.Common.darwin-aarch64
new file mode 100644
index 0000000..eaba1ef
--- /dev/null
+++ b/configure/os/CONFIG.Common.darwin-aarch64
@@ -0,0 +1,14 @@
+# CONFIG.Common.darwin-aarch64
+#
+# This file is maintained by the build community.
+#
+# Definitions for darwin-aarch64 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.darwin-aarch64
+#-------------------------------------------------------
+
+#
+# To build universal binaries, configure ARCH_CLASS
+# in the file CONFIG_SITE.Common.darwin-aarch64
+
+# Include definitions common to all Darwin targets
+include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon
diff --git a/configure/os/CONFIG.darwin-aarch64.Common b/configure/os/CONFIG.darwin-aarch64.Common
new file mode 100644
index 0000000..0be8d68
--- /dev/null
+++ b/configure/os/CONFIG.darwin-aarch64.Common
@@ -0,0 +1,8 @@
+# CONFIG.darwin-aarch64.Common
+#
+# Definitions for darwin-aarch64 host builds
+# Sites may override these definitions in CONFIG_SITE.darwin-aarch64.Common
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.UnixCommon.Common
diff --git a/configure/os/CONFIG_SITE.Common.darwin-aarch64 b/configure/os/CONFIG_SITE.Common.darwin-aarch64
new file mode 100644
index 0000000..8d79eb1
--- /dev/null
+++ b/configure/os/CONFIG_SITE.Common.darwin-aarch64
@@ -0,0 +1,9 @@
+# CONFIG_SITE.Common.darwin-aarch64
+#
+# Site override definitions for darwin-aarch64 target builds
+#-------------------------------------------------------
+
+#
+#   arm64 devices:  Apple Silicon M1
+
+ARCH_CLASS = arm64
diff --git a/src/tools/EpicsHostArch.pl b/src/tools/EpicsHostArch.pl
index d1508bf..52c4272 100644
--- a/src/tools/EpicsHostArch.pl
+++ b/src/tools/EpicsHostArch.pl
@@ -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";
         }