Configuration: darwin64-arm64-cc for Apple silicon

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12369)

diff --git a/CHANGES b/CHANGES
index 401ae7a339c695c0a31af9c49328f6d7d86907d6..b927cf13614d3023c66b1e898f83914e1b17c389 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -46,6 +46,9 @@
 
   *) The Oracle Developer Studio compiler will start reporting deprecated APIs
 
+  *) Add support for Apple Silicon M1 Macs with the darwin64-arm64-cc target.
+     [Stuart Carnie]
+
  Changes between 1.1.1f and 1.1.1g [21 Apr 2020]
 
   *) Fixed segmentation fault in SSL_check_chain()

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index eb92c24f48df553248b20b10543c02988bc707da..cea4feb9a01baa4ec1150ca5ab642f249d13a1c7 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1557,6 +1557,14 @@ my %targets = (
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "macosx",
     },
+    "darwin64-arm64-cc" => {
+        inherit_from     => [ "darwin-common", asm("aarch64_asm") ],
+        CFLAGS           => add("-Wall"),
+        cflags           => add("-arch arm64"),
+        lib_cppflags     => add("-DL_ENDIAN"),
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
+        perlasm_scheme   => "ios64",
+    },
 
 ##### GNU Hurd
     "hurd-x86" => {

diff --git a/config b/config
index f28828d4826eebba5c1b918c92500cb7dfaf3bab..26225ca2a9e529882928bb66f488a8fde9ecca71 100755 (executable)
--- a/config
+++ b/config
@@ -253,11 +253,8 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
            Power*)
                echo "ppc-apple-darwin${VERSION}"
                ;;
-           x86_64)
-               echo "x86_64-apple-darwin${VERSION}"
-               ;;
            *)
-               echo "i686-apple-darwin${VERSION}"
+               echo "${MACHINE}-apple-darwin${VERSION}"
                ;;
        esac
        exit 0
@@ -497,6 +494,9 @@ case "$GUESSOS" in
        else
            OUT="darwin64-x86_64-cc"
        fi ;;
+  $MACHINE-apple-darwin*)
+       OUT="darwin64-$MACHINE-cc"
+       ;;
   armv6+7-*-iphoneos)
        __CNF_CFLAGS="$__CNF_CFLAGS -arch armv6 -arch armv7"
        __CNF_CXXFLAGS="$__CNF_CXXFLAGS -arch armv6 -arch armv7"