54 lines
3.9 KiB
Diff
54 lines
3.9 KiB
Diff
diff --git a/include/cln/object.h b/include/cln/object.h
|
|
index 3a47117..376baf8 100644
|
|
--- a/include/cln/object.h
|
|
+++ b/include/cln/object.h
|
|
@@ -22,7 +22,7 @@ namespace cln {
|
|
#if defined(__m68k__)
|
|
#define cl_word_alignment 2
|
|
#endif
|
|
-#if defined(__i386__) || defined(__mips__) || defined(__mipsel__) || (defined(__sparc__) && !defined(__arch64__)) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || (defined(__s390__) && !defined(__s390x__)) || defined(__sh__) || (defined(__x86_64__) && defined(__ILP32__))
|
|
+#if defined(__i386__) || defined(__mips__) || defined(__mipsel__) || (defined(__sparc__) && !defined(__arch64__)) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || (defined(__s390__) && !defined(__s390x__)) || defined(__sh__) || (defined(__x86_64__) && defined(__ILP32__)) || defined(__aarch64__)
|
|
#define cl_word_alignment 4
|
|
#endif
|
|
#if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(__s390x__)
|
|
diff --git a/include/cln/types.h b/include/cln/types.h
|
|
index ce8d7a6..9e820cd 100644
|
|
--- a/include/cln/types.h
|
|
+++ b/include/cln/types.h
|
|
@@ -48,7 +48,7 @@
|
|
#undef HAVE_LONGLONG
|
|
#endif
|
|
#endif
|
|
- #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__))
|
|
+ #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__)) || defined(__aarch64__)
|
|
// 64 bit registers in hardware
|
|
#define HAVE_FAST_LONGLONG
|
|
#endif
|
|
@@ -76,7 +76,7 @@
|
|
|
|
// Integer type used for counters.
|
|
// Constraint: sizeof(uintC) >= sizeof(uintL)
|
|
- #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__)))
|
|
+ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__))) || defined(__aarch64__)
|
|
#define intCsize long_bitsize
|
|
typedef long sintC;
|
|
typedef unsigned long uintC;
|
|
@@ -88,7 +88,7 @@
|
|
|
|
// Integer type used for lfloat exponents.
|
|
// Constraint: sizeof(uintE) >= sizeof(uintC)
|
|
-#if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__)))
|
|
+#if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__))) || defined(__aarch64__)
|
|
#define intEsize 64
|
|
typedef sint64 sintE;
|
|
typedef uint64 uintE;
|
|
@@ -127,7 +127,7 @@
|
|
typedef int sintD;
|
|
typedef unsigned int uintD;
|
|
#else // we are not using GMP, so just guess something reasonable
|
|
- #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__s390x__) || defined(__x86_64__)))
|
|
+ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__s390x__) || defined(__x86_64__))) || defined(__aarch64__)
|
|
#define intDsize 64
|
|
typedef sint64 sintD;
|
|
typedef uint64 uintD;
|