commit 04cb9ac59ea0943b298ccb1f3db3e4d97da40dff
author Dave Rodgman <dave.rodgman@arm.com> Wed Jun 21 07:32:22 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Wed Jun 21 07:32:22 2023 +0100
tree 6f3db74bc36027d25a749fb3f4a3aa2c11b5424c
parent b19f584f2c1001ac9e4af3750fdc84d5bd53f6ca

Fix for arm64_32 (aka ILP32) on Clang (attempt 2)

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 6e02f34..b24ebb4 100644
--- a/library/constant_time.c
+++ b/library/constant_time.c
@@ -78,10 +78,8 @@
     uint32_t r;
 #if defined(__arm__) || defined(__thumb__) || defined(__thumb2__)
     asm volatile ("ldr %0, [%1]" : "=r" (r) : "r" (p) :);
-#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) :);
+#elif defined(__aarch64__)
+    asm volatile ("ldr %w0, [%1]" : "=r" (r) : "p" (p) :);
 #endif
     return r;
 }