summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'ios/ios_arch-arm.h')
-rw-r--r--ios/ios_arch-arm.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/ios/ios_arch-arm.h b/ios/ios_arch-arm.h
index f1ab071d..cd7b9fc0 100644
--- a/ios/ios_arch-arm.h
+++ b/ios/ios_arch-arm.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2020 Artifex Software, Inc.
+/* Copyright (C) 2001-2021 Artifex Software, Inc.
All Rights Reserved.
This software is provided AS-IS with no warranty, either express or
@@ -13,12 +13,13 @@
CA 94945, U.S.A., +1(415)492-9861, for further information.
*/
-#ifdef __ARM64_ARCH_8__
+#if defined(__ARM64_ARCH_8__) && __ARM64_ARCH_8__ == 1
/* ---------------- Scalar alignments ---------------- */
#define ARCH_ALIGN_SHORT_MOD 2
#define ARCH_ALIGN_INT_MOD 4
#define ARCH_ALIGN_LONG_MOD 8
+#define ARCH_ALIGN_SIZE_T_MOD 8
#define ARCH_ALIGN_PTR_MOD 8
#define ARCH_ALIGN_FLOAT_MOD 4
#define ARCH_ALIGN_DOUBLE_MOD 8
@@ -33,7 +34,9 @@
#define ARCH_LOG2_SIZEOF_PTR 3
#define ARCH_LOG2_SIZEOF_FLOAT 2
#define ARCH_LOG2_SIZEOF_DOUBLE 3
+#define ARCH_LOG2_SIZEOF_SIZE_T 3
+#define ARCH_SIZEOF_SIZE_T 8
#define ARCH_SIZEOF_PTR 8
#define ARCH_SIZEOF_FLOAT 4
#define ARCH_SIZEOF_DOUBLE 8
@@ -44,6 +47,7 @@
#define ARCH_MAX_USHORT ((unsigned short)~(unsigned short)0 + (unsigned short)0)
#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
+#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0)
/* ---------------- Floating point ---------------- */
@@ -96,12 +100,13 @@
#define ARCH_ARITH_RSHIFT 2
#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#elif defined(__ARM_ARCH_7S__) /* __ARM64_ARCH_8__ */
+#elif defined(__ARM_ARCH_7S__) && __ARM_ARCH_7S__ == 1 /* __ARM64_ARCH_8__ */
/* ---------------- Scalar alignments ---------------- */
#define ARCH_ALIGN_SHORT_MOD 2
#define ARCH_ALIGN_INT_MOD 4
#define ARCH_ALIGN_LONG_MOD 4
+#define ARCH_ALIGN_SIZE_T_MOD 4
#define ARCH_ALIGN_PTR_MOD 4
#define ARCH_ALIGN_FLOAT_MOD 4
#define ARCH_ALIGN_DOUBLE_MOD 4
@@ -116,7 +121,9 @@
#define ARCH_LOG2_SIZEOF_PTR 2
#define ARCH_LOG2_SIZEOF_FLOAT 2
#define ARCH_LOG2_SIZEOF_DOUBLE 3
+#define ARCH_LOG2_SIZEOF_SIZE_T 2
+#define ARCH_SIZEOF_SIZE_T 4
#define ARCH_SIZEOF_PTR 4
#define ARCH_SIZEOF_FLOAT 4
#define ARCH_SIZEOF_DOUBLE 8
@@ -127,6 +134,7 @@
#define ARCH_MAX_USHORT ((unsigned short)~(unsigned short)0 + (unsigned short)0)
#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
+#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0)
/* ---------------- Floating point ---------------- */
@@ -186,6 +194,7 @@
#define ARCH_ALIGN_SHORT_MOD 2
#define ARCH_ALIGN_INT_MOD 4
#define ARCH_ALIGN_LONG_MOD 4
+#define ARCH_ALIGN_SIZE_T_MOD 4
#define ARCH_ALIGN_PTR_MOD 4
#define ARCH_ALIGN_FLOAT_MOD 4
#define ARCH_ALIGN_DOUBLE_MOD 4
@@ -200,7 +209,9 @@
#define ARCH_LOG2_SIZEOF_PTR 2
#define ARCH_LOG2_SIZEOF_FLOAT 2
#define ARCH_LOG2_SIZEOF_DOUBLE 3
+#define ARCH_LOG2_SIZEOF_SIZE_T 2
+#define ARCH_SIZEOF_SIZE_T 4
#define ARCH_SIZEOF_PTR 4
#define ARCH_SIZEOF_FLOAT 4
#define ARCH_SIZEOF_DOUBLE 8
@@ -211,6 +222,7 @@
#define ARCH_MAX_USHORT ((unsigned short)~(unsigned short)0 + (unsigned short)0)
#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
+#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0)
/* ---------------- Floating point ---------------- */