Merge remote-tracking branch 'official-hxcpp/master'

Author: intoxopox

project/thirdparty/mbedtls-2.9.0/library/bignum.c

@@ -1114,7 +1114,8 @@ int mbedtls_mpi_sub_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint
  * Helper for mbedtls_mpi multiplication
  */
 static
-#if defined(__APPLE__) && defined(__arm__)
+// Also a problem on x64 rosetta
+#if defined(__APPLE__)
 /*
  * Apple LLVM version 4.2 (clang-425.0.24) (based on LLVM 3.2svn)
  * appears to need this to prevent bad ARM code generation at -O3.

tools/hxcpp/BuildTool.hx

@@ -1325,7 +1325,7 @@ class BuildTool
          process.exitCode();
          process.close();
 
-         if (output.indexOf("aarch64") > -1)
+         if ( (output.indexOf("aarch64") > -1) ||  (output.indexOf("arm64") > -1) )
          {
             return "arm64";
          }
@@ -2050,7 +2050,7 @@ class BuildTool
       }
       else if ( (new EReg("mac","i")).match(os) )
       {
-         set64(defines,m64);
+         set64(defines,m64, arm64);
          // Cross-compile?
          if (defines.exists("linux"))
          {