Merge branch 'master' of jsoftware.com:jsource

jsoftware · Nov 6, 2024 · 8cbfe75 · 8cbfe75
2 parents 625f8b0 + faebc25
commit 8cbfe75
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/jsrc/x15.c b/jsrc/x15.c
@@ -97,7 +97,11 @@ return (void*)((uintptr_t)((dvc)+((align)-1)) & ~((align)-1));
 }
 */
 
+#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
@@ -245,7 +249,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 +261,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]);