cmake: make possible to build sel_ldr with 16K PageSize

Author: illwieckz

cmake/NaClFlags.cmake

@@ -4,6 +4,11 @@ if (NOT MSVC)
 	option(USE_STATIC_LIBS "Tries to use static libs where possible." OFF)
 endif()
 
+if (ARCH_armhf)
+	option(USE_ARMHF_16K_PAGESIZE "Build armhf binaries with 16K PageSize." OFF)
+	list(APPEND INHERITED_OPTIONS "USE_ARMHF_16K_PAGESIZE")
+endif()
+
 macro(set_ASM_flag FLAG)
 	set(lang ASM)
 	if (${ARGC} GREATER 1)
@@ -93,6 +98,10 @@ if (USE_STATIC_LIBS)
 	set_linker_flag("-static")
 endif()
 
+if (USE_ARMHF_16K_PAGESIZE)
+	set_linker_flag("-Wl,-z,max-page-size=16384")
+endif()
+
 #TODO: Import from SetUpClang() from (root)/SConstruct.
 #TODO: This is mostly ASAN configurations.
 

src/trusted/service_runtime/linux/CMakeLists.txt

@@ -90,14 +90,20 @@ string(REPLACE ";" " " BOOTSTRAP_FLAGS_STRING "${BOOTSTRAP_FLAGS}")
 add_library(nacl_bootstrap OBJECT "nacl_bootstrap.c")
 set_target_properties(nacl_bootstrap PROPERTIES COMPILE_FLAGS ${BOOTSTRAP_FLAGS_STRING})
 
+if (USE_ARMHF_16K_PAGESIZE)
+	set(MAX_PAGE_SIZE 0x4000)
+else()
+	set(MAX_PAGE_SIZE 0x1000)
+endif()
+
 add_custom_target(nacl_bootstrap_raw
 	COMMAND env "${PYTHON}"
 		"${CMAKE_CURRENT_LIST_DIR}/ld_bfd.py"
 		--compiler "${COMPILER_OVERRIDE}"
 		-m "${LD_EMUL}"
 		--build-id
 		-static
-		-z "max-page-size=0x1000"
+		-z "max-page-size=${MAX_PAGE_SIZE}"
 		--defsym RESERVE_TOP="${RESERVE_TOP}"
 		--script "${CMAKE_CURRENT_LIST_DIR}/nacl_bootstrap.x"
 		-o "${CMAKE_CURRENT_BINARY_DIR}/nacl_bootstrap_raw"