From ebadc969a8dd8d884bf636a2b3fd21ad082a72fe Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Thu, 9 Nov 2023 11:21:14 -0800 Subject: [PATCH] 16k: Support max-page-size alignment greater than 4096 for x86-64 To simulate 16k page size in x86-64 cuttefish, it is necessary to compile the shared libraries and binaries with max-page-size greater than 4096. Bug: 309816695 Test: source build/envsetup.sh lunch aosp_cf_x86_64_phone_pgagnostic-trunk-userdebug m Change-Id: Id8e142a5a3556f5fd30ce90eaac236dcbc1b0881 --- core/config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/config.mk b/core/config.mk index c747fd5fb3..a26ad670cf 100644 --- a/core/config.mk +++ b/core/config.mk @@ -427,10 +427,10 @@ else endif .KATI_READONLY := TARGET_MAX_PAGE_SIZE_SUPPORTED -# Only arm64 arch supports TARGET_MAX_PAGE_SIZE_SUPPORTED greater than 4096. +# Only arm64 and x86_64 archs supports TARGET_MAX_PAGE_SIZE_SUPPORTED greater than 4096. ifneq ($(TARGET_MAX_PAGE_SIZE_SUPPORTED),4096) - ifneq ($(TARGET_ARCH),arm64) - $(error TARGET_MAX_PAGE_SIZE_SUPPORTED=$(TARGET_MAX_PAGE_SIZE_SUPPORTED) is greater than 4096. Only supported in arm64 arch) + ifeq (,$(filter arm64 x86_64,$(TARGET_ARCH))) + $(error TARGET_MAX_PAGE_SIZE_SUPPORTED=$(TARGET_MAX_PAGE_SIZE_SUPPORTED) is greater than 4096. Only supported in arm64 and x86_64 archs) endif endif