cmake,bootstrap: Make possible to build sel_ldr and nacl_helper_bootstrap with 16K page size

Author: illwieckz

cmake/NaClFlags.cmake

@@ -1,5 +1,10 @@
 option(USE_WERROR "Tell the compiler to make the build fail when warnings are present." OFF)
 
+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)
@@ -84,6 +89,10 @@ macro(set_linker_flag FLAG)
 	endforeach()
 endmacro()
 
+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

@@ -106,14 +106,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"

src/trusted/service_runtime/linux/nacl_bootstrap.x

@@ -65,35 +65,35 @@ SECTIONS {
    * It's both part of the text PT_LOAD segment (like other rodata) and
    * it's what the PT_NOTE header points to.
    */
-  .note.gnu.build-id : {
+  .note.gnu.build-id : ALIGN(CONSTANT(MAXPAGESIZE)) {
     *(.note.gnu.build-id)
   } :text :note
 
   /*
    * Here is the program itself.
    */
-  .text : {
+  .text : ALIGN(CONSTANT(MAXPAGESIZE)) {
     *(.text*)
   } :text
-  .rodata : {
+  .rodata : ALIGN(CONSTANT(MAXPAGESIZE)) {
     *(.rodata*)
     *(.eh_frame*)
   }
 
   etext = .;
 
   /*
-   * Adjust the address for the data segment.  We want to adjust up to
+   * Adjust the address for the data segment. We want to adjust up to
    * the same address within the page on the next page up.
    */
   . = (ALIGN(CONSTANT(MAXPAGESIZE)) -
        ((CONSTANT(MAXPAGESIZE) - .) & (CONSTANT(MAXPAGESIZE) - 1)));
   . = DATA_SEGMENT_ALIGN(CONSTANT(MAXPAGESIZE), CONSTANT(COMMONPAGESIZE));
 
-  .data : {
+  .data : ALIGN(CONSTANT(MAXPAGESIZE)) {
     *(.data*)
   } :data
-  .bss : {
+  .bss : ALIGN(CONSTANT(MAXPAGESIZE)) {
     *(.bss*)
   }
 
@@ -107,9 +107,9 @@ SECTIONS {
    * It just maps it from the file, i.e. way off the end of the file,
    * which is perfect for reserving the address space.
    */
-  . = ALIGN(CONSTANT(COMMONPAGESIZE));
+  . = ALIGN(CONSTANT(MAXPAGESIZE));
   RESERVE_START = .;
-  .reserve : {
+  .reserve : ALIGN(CONSTANT(MAXPAGESIZE)) {
     . += (RESERVE_TOP > RESERVE_START) ? (RESERVE_TOP - RESERVE_START) : 0;
   } :reserve
 
@@ -118,7 +118,7 @@ SECTIONS {
    * be clobbered by NaCl.  We want this to be visible at its fixed address
    * in the memory image so the debugger can make sense of things.
    */
-  .r_debug : {
+  .r_debug : ALIGN(CONSTANT(MAXPAGESIZE)) {
     *(.r_debug)
   } :r_debug