pushed to master branch On Sat, Apr 1, 2023 at 10:01 AM Mahesh Pittala <[email protected]> wrote:
> From 36785eac984d808d69b5221e84db29103d0b8048 Mon Sep 17 00:00:00 2001 > From: Min Chen <[email protected]> > Date: Sat, 1 Apr 2023 09:11:08 +0530 > Subject: [PATCH] Fix build error in MacOS aarch64 > > tested on mac2.metal aws instance > > Signed-off-by: maheshpittala <[email protected]> > --- > source/common/aarch64/asm.S | 5 +++++ > source/common/aarch64/pixel-util.S | 2 +- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/source/common/aarch64/asm.S b/source/common/aarch64/asm.S > index 2506f50aa..cff069058 100644 > --- a/source/common/aarch64/asm.S > +++ b/source/common/aarch64/asm.S > @@ -64,6 +64,11 @@ > #endif > #endif > > +#define GLUE(a, b) a ## b > +#define JOIN(a, b) GLUE(a, b) > + > +#define PFX_C(name) JOIN(JOIN(JOIN(EXTERN_ASM, X265_NS), _), name) > + > #ifdef __APPLE__ > .macro endfunc > ELF .size \name, . - \name > diff --git a/source/common/aarch64/pixel-util.S > b/source/common/aarch64/pixel-util.S > index fba9a90d5..0e85c8792 100644 > --- a/source/common/aarch64/pixel-util.S > +++ b/source/common/aarch64/pixel-util.S > @@ -2407,7 +2407,7 @@ function PFX(costCoeffNxN_neon) > // x5 - scanFlagMask > // x6 - baseCtx > mov x0, #0 > - movrel x1, x265_entropyStateBits > + movrel x1, PFX_C(entropyStateBits) > mov x4, #0 > mov x11, #0 > movi v31.16b, #0 > -- > 2.23.0.windows.1 > >
_______________________________________________ x265-devel mailing list [email protected] https://mailman.videolan.org/listinfo/x265-devel
