<div dir="ltr">pushed to master branch</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sat, Apr 1, 2023 at 10:01 AM Mahesh Pittala <<a href="mailto:mahesh@multicorewareinc.com">mahesh@multicorewareinc.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">From 36785eac984d808d69b5221e84db29103d0b8048 Mon Sep 17 00:00:00 2001<br>From: Min Chen <<a href="mailto:min.chen@multicorewareinc.com" target="_blank">min.chen@multicorewareinc.com</a>><br>Date: Sat, 1 Apr 2023 09:11:08 +0530<br>Subject: [PATCH] Fix build error in MacOS aarch64<br><br>tested on mac2.metal aws instance<br><br>Signed-off-by: maheshpittala <<a href="mailto:mahesh@multicorewareinc.com" target="_blank">mahesh@multicorewareinc.com</a>><br>---<br> source/common/aarch64/asm.S        | 5 +++++<br> source/common/aarch64/pixel-util.S | 2 +-<br> 2 files changed, 6 insertions(+), 1 deletion(-)<br><br>diff --git a/source/common/aarch64/asm.S b/source/common/aarch64/asm.S<br>index 2506f50aa..cff069058 100644<br>--- a/source/common/aarch64/asm.S<br>+++ b/source/common/aarch64/asm.S<br>@@ -64,6 +64,11 @@<br> #endif<br> #endif<br> <br>+#define GLUE(a, b) a ## b<br>+#define JOIN(a, b) GLUE(a, b)<br>+<br>+#define PFX_C(name)        JOIN(JOIN(JOIN(EXTERN_ASM, X265_NS), _), name)<br>+<br> #ifdef __APPLE__<br> .macro endfunc<br> ELF .size \name, . - \name<br>diff --git a/source/common/aarch64/pixel-util.S b/source/common/aarch64/pixel-util.S<br>index fba9a90d5..0e85c8792 100644<br>--- a/source/common/aarch64/pixel-util.S<br>+++ b/source/common/aarch64/pixel-util.S<br>@@ -2407,7 +2407,7 @@ function PFX(costCoeffNxN_neon)<br>     // x5 - scanFlagMask<br>     // x6 - baseCtx<br>     mov             x0, #0<br>-    movrel          x1, x265_entropyStateBits<br>+    movrel          x1, PFX_C(entropyStateBits)<br>     mov             x4, #0<br>     mov             x11, #0<br>     movi            v31.16b, #0<br>-- <br>2.23.0.windows.1<br><br></div>
</blockquote></div>