[Bf-blender-cvs] [a0df60eeb73] tmp-macs-arm-cycles: macOS: fix Cycles not detecting 64 bit and failing to build with Embree

[Brecht Van Lommel]

Commit: a0df60eeb73f738a778011e04bbaa910f70ba127
Author: Brecht Van Lommel
Date:   Mon Feb 15 17:41:30 2021 +0100
Branches: tmp-macs-arm-cycles
https://developer.blender.org/rBa0df60eeb73f738a778011e04bbaa910f70ba127

macOS: fix Cycles not detecting 64 bit and failing to build with Embree

Contributed by Apple

Ref D9527, T78710

===================================================================

M	intern/cycles/bvh/bvh_embree.cpp
M	intern/cycles/util/util_defines.h

===================================================================

diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp
index c082478e5b1..07d5d672dce 100644
--- a/intern/cycles/bvh/bvh_embree.cpp
+++ b/intern/cycles/bvh/bvh_embree.cpp
@@ -31,8 +31,6 @@
 #ifdef WITH_EMBREE
 
 #  include <embree3/rtcore_geometry.h>
-#  include <pmmintrin.h>
-#  include <xmmintrin.h>
 
 #  include "bvh/bvh_embree.h"
 
@@ -306,8 +304,7 @@ BVHEmbree::BVHEmbree(const BVHParams &params_,
       rtc_device(NULL),
       build_quality(RTC_BUILD_QUALITY_REFIT)
 {
-  _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);
-  _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);
+  SIMD_SET_FLUSH_TO_ZERO;
 }
 
 BVHEmbree::~BVHEmbree()
diff --git a/intern/cycles/util/util_defines.h b/intern/cycles/util/util_defines.h
index e8e414587fb..0a239a944a5 100644
--- a/intern/cycles/util/util_defines.h
+++ b/intern/cycles/util/util_defines.h
@@ -26,7 +26,7 @@
 /* Bitness */
 
 #if defined(__ppc64__) || defined(__PPC64__) || defined(__x86_64__) || defined(__ia64__) || \
-    defined(_M_X64)
+    defined(_M_X64) || defined(__aarch64__)
 #  define __KERNEL_64_BIT__
 #endif