From e978735db8837c78c4067b507ead7e7990f17cdf Mon Sep 17 00:00:00 2001 From: bill lam Date: Wed, 6 Nov 2024 21:44:31 +0800 Subject: [PATCH 1/2] test --- jsrc/x15.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jsrc/x15.c b/jsrc/x15.c index 17be026dc..0984e08c5 100644 --- a/jsrc/x15.c +++ b/jsrc/x15.c @@ -97,7 +97,7 @@ return (void*)((uintptr_t)((dvc)+((align)-1)) & ~((align)-1)); } */ -#define SY_UNIX64 (SY_64 && (SY_LINUX || SY_MAC || SY_FREEBSD || SY_OPENBSD)) +#define SY_UNIX64 (SY_64 && (defined(__aarch64__) || SY_LINUX || SY_MAC || SY_FREEBSD || SY_OPENBSD)) #if SY_WINCE #define HINSTANCE_ERROR 0 @@ -245,7 +245,6 @@ static void double_trick(double*v, I n){I i=0; #define dtrick double_trick(dd,dcnt); #elif SY_64 && SY_WIN32 && !defined(__aarch64__) #define dtrick {D*pd=(D*)d; double_trick(pd[0],pd[1],pd[2],pd[3]);} -#error windows arm64 #elif SY_64 && SY_WIN32 && defined(__aarch64__) #define dtrick double_trick(dd[0],dd[1],dd[2],dd[3],dd[4],dd[5],dd[6],dd[7]); #elif SY_64 && SY_LINUX @@ -258,8 +257,6 @@ static void double_trick(double*v, I n){I i=0; #if SY_64 #if SY_WIN32 && !defined(__aarch64__) #define dtrick {D*pd=(D*)d; double_trick(pd[0],pd[1],pd[2],pd[3]);} - #elif SY_WIN32 && defined(__aarch64__) - #define dtrick double_trick(dd[0],dd[1],dd[2],dd[3],dd[4],dd[5],dd[6],dd[7]); #elif SY_UNIX64 #ifdef __PPC64__ #define dtrick double_trick(dd[0],dd[1],dd[2],dd[3],dd[4],dd[5],dd[6],dd[7],dd[8],dd[9],dd[10],dd[11],dd[12]); From faebc25c513e149ec83ac172a9b7cea91b82544a Mon Sep 17 00:00:00 2001 From: bill lam Date: Wed, 6 Nov 2024 22:14:19 +0800 Subject: [PATCH 2/2] test --- jsrc/x15.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jsrc/x15.c b/jsrc/x15.c index 0984e08c5..c37a09828 100644 --- a/jsrc/x15.c +++ b/jsrc/x15.c @@ -97,7 +97,11 @@ return (void*)((uintptr_t)((dvc)+((align)-1)) & ~((align)-1)); } */ -#define SY_UNIX64 (SY_64 && (defined(__aarch64__) || SY_LINUX || SY_MAC || SY_FREEBSD || SY_OPENBSD)) +#if defined(__aarch64__) +#define SY_UNIX64 1 +#else +#define SY_UNIX64 (SY_64 && (SY_LINUX || SY_MAC || SY_FREEBSD || SY_OPENBSD)) +#endif #if SY_WINCE #define HINSTANCE_ERROR 0