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

Author: illwieckz

SConstruct

@@ -2481,6 +2481,11 @@ def which(cmd, paths=os.environ.get('PATH', '').split(os.pathsep)):
 
 
 def SetUpLinuxEnvArm(env):
+  if env.Bit('build_arm'):
+    max_page_size='0x10000'
+  else:
+    max_page_size='0x1000'
+
   jail = env.GetToolchainDir(toolchain_name='arm_trusted')
   if not platform.machine().startswith('arm'):
     # Allow emulation on non-ARM hosts.
@@ -2513,11 +2518,17 @@ 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'])
 
 def SetUpAndroidEnv(env):
+  if env.Bit('build_arm'):
+    max_page_size='0x10000'
+  else:
+    max_page_size='0x1000'
+
   env.FilterOut(CPPDEFINES=[['_LARGEFILE64_SOURCE', '1']])
   android_ndk_root = os.path.join('${SOURCE_ROOT}', 'third_party',
                                   'android_ndk')
@@ -2614,6 +2625,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,

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')),