commit b19f584f2c1001ac9e4af3750fdc84d5bd53f6ca
author Dave Rodgman <dave.rodgman@arm.com> Tue Jun 20 23:01:43 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Tue Jun 20 23:01:43 2023 +0100
tree d841568cb230b8ddc80fbaeaa34b957af91c77f1
parent a3a0025e1831b9d22e8587d88a4d4d42dfad38bb

Fix for arm64_32 (aka ILP32) on Clang

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/constant_time.c

diff --git a/library/constant_time.c b/library/constant_time.c
index c823b78..6e02f34 100644
--- a/library/constant_time.c
+++ b/library/constant_time.c
@@ -78,8 +78,10 @@
     uint32_t r;
 #if defined(__arm__) || defined(__thumb__) || defined(__thumb2__)
     asm volatile ("ldr %0, [%1]" : "=r" (r) : "r" (p) :);
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) && (SIZE_MAX == 0xffffffffffffffff)
     asm volatile ("ldr %w0, [%1]" : "=r" (r) : "r" (p) :);
+#elif defined(__aarch64__) && (SIZE_MAX == 0xffffffff)
+    asm volatile ("ldr %w0, [%w1]" : "=r" (r) : "r" (p) :);
 #endif
     return r;
 }