From 4d8356c8555dd3ebe442533567a5f064a146c3ea Mon Sep 17 00:00:00 2001
From: Dave Neary <nearyd@gmail.com>
Date: Tue, 6 May 2025 19:25:19 -0400
Subject: [PATCH 1/2] Use LG_SIZE=16 by default for aarch64-linux-gnu - 64K and
 16K page sizes should be supported out of the box.

---
 configure.ac | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/configure.ac b/configure.ac
index c615cab2..b4a1993c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1911,6 +1911,13 @@ case "${host}" in
         LG_PAGE=14
       fi
       ;;
+  aarch64-linux-gnu*)
+      dnl When cross-compile for 64 bit Arm64, use memory granularity of 64K to ensure
+      dnl that 64K and 16K kernel sizes (default for many distros) function al all.
+      if test "x${host}" != "x${build}" -a "x$LG_PAGE" = "xdetect"; then
+        LG_PAGE=16
+      fi
+      ;;
 esac
 if test "x$LG_PAGE" = "xdetect"; then
   AC_CACHE_CHECK([LG_PAGE],

From a7b0bafb1052ac9c02e73af860791c3aaabf79d5 Mon Sep 17 00:00:00 2001
From: Dave Neary <nearyd@gmail.com>
Date: Tue, 6 May 2025 20:21:15 -0400
Subject: [PATCH 2/2] Fix error with conditional around page size for Arm64
 servers

---
 configure.ac | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index b4a1993c..d83cb594 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1911,10 +1911,11 @@ case "${host}" in
         LG_PAGE=14
       fi
       ;;
-  aarch64-linux-gnu*)
-      dnl When cross-compile for 64 bit Arm64, use memory granularity of 64K to ensure
-      dnl that 64K and 16K kernel sizes (default for many distros) function al all.
-      if test "x${host}" != "x${build}" -a "x$LG_PAGE" = "xdetect"; then
+  aarch64-*-linux-gnu*)
+      dnl When cross-compile for 64 bit Arm64, in the absence of an explicit flag setting page size, 
+      dnl use memory granularity of 64K to ensure that 64K and 16K kernel sizes (default for many
+      dnl distros) function al all.
+      if test "x$LG_PAGE" = "xdetect"; then
         LG_PAGE=16
       fi
       ;;