Skip to content

Commit aae45d3

Browse files
Fix ARM64 macro detection for Windows on ARM builds
Agent-Logs-Url: https://github.com/RenderKit/embree/sessions/71a93d2a-2cfa-4e53-ad36-40765438ddee Co-authored-by: stefanatwork <93931354+stefanatwork@users.noreply.github.com>
1 parent 738773d commit aae45d3

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

common/sys/intrinsics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <intrin.h>
1010
#endif
1111

12-
#if defined(__ARM_NEON)
12+
#if defined(__ARM_NEON) || defined(__aarch64__)
1313
#include "../simd/arm/emulation.h"
1414
#else
1515
#include <immintrin.h>

common/sys/platform.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@
5757
#define __X86_ASM__
5858
#endif
5959

60+
/* normalize ARM64 platform macro */
61+
#if defined(_M_ARM64) || defined(_M_ARM64EC)
62+
#define __aarch64__
63+
#endif
64+
6065
/* detect 64 bit platform */
6166
#if defined(__X86_64__) || defined(__aarch64__)
6267
#define __64BIT__

0 commit comments

Comments
 (0)