scons: build arm sel_ldr and nacl_helper_bootstrap with 16K page size

Author: illwieckz

SConstruct

@@ -2513,6 +2513,7 @@ def SetUpLinuxEnvArm(env):
                   LD='arm-linux-gnueabihf-ld')
     env.Prepend(CCFLAGS=['-march=armv7-a','-mfloat-abi=hard',
                          '-mtune=generic-armv7-a', '-mfpu=neon'])
+    env.Append(CCFLAGS=['-Wl,-z,max-page-size=${MAX_PAGE_SIZE}'])
 
   # get_plugin_dirname.cc has a dependency on dladdr
   env.Append(LIBS=['dl'])
@@ -2614,6 +2615,7 @@ def SetUpAndroidEnv(env):
                       '-D__ANDROID__',
                       # Due to bogus warnings on uintptr_t formats.
                       '-Wno-format',
+                      '-Wl,-z,max-page-size=${MAX_PAGE_SIZE}',
                       ] + arch_cflags,
              CXXFLAGS=['-I%s' % android_stlport_include,
                        '-I%s' % android_ndk_include,
@@ -2688,6 +2690,8 @@ def MakeGenericLinuxEnv(platform=None):
       LINK = '$CXX',
   )
 
+  linux_env.SetDefault(MAX_PAGE_SIZE='0x1000')
+
   # Prepend so we can disable warnings via Append
   linux_env.Prepend(
       CPPDEFINES = [['_POSIX_C_SOURCE', '199506'],
@@ -2710,6 +2714,7 @@ def MakeGenericLinuxEnv(platform=None):
         LINKFLAGS = ['-m64'] + sysroot_flags,
         )
   elif linux_env.Bit('build_arm'):
+    linux_env.Replace(MAX_PAGE_SIZE='0x10000')
     SetUpLinuxEnvArm(linux_env)
   elif linux_env.Bit('build_mips32'):
     SetUpLinuxEnvMips(linux_env)

src/trusted/service_runtime/build.scons

@@ -427,7 +427,7 @@ if (env.Bit('linux') and not env.Bit('built_elsewhere')):
       'nacl_bootstrap_raw',
       [bootstrap_obj],
       ("env CXX='${CXX}' ${PYTHON} %s %s " +
-       '-m %s --build-id -static -z max-page-size=0x1000 ' +
+       '-m %s --build-id -static -z max-page-size=${MAX_PAGE_SIZE} ' +
        '--defsym RESERVE_TOP=%s --script %s -o ${TARGET} ${SOURCES}') %
       (bootstrap_env.File('linux/ld_bfd.py'), compiler_override, ld_emul,
        reserve_top, bootstrap_env.File('linux/nacl_bootstrap.x')),