Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / native_client / pnacl / driver / pnacl-nativeld.py

diff --git a/src/native_client/pnacl/driver/pnacl-nativeld.py b/src/native_client/pnacl/driver/pnacl-nativeld.py
index 7e6f552..d4fb2b9 100755 (executable)
--- a/src/native_client/pnacl/driver/pnacl-nativeld.py
+++ b/src/native_client/pnacl/driver/pnacl-nativeld.py
@@ -13,11 +13,15 @@
 # --pnacl-sb will cause the sandboxed LD to be used.
 # The bulk of this file is logic to invoke the sandboxed translator.
 
-from driver_tools import *
+import subprocess
+
+from driver_tools import CheckTranslatorPrerequisites, GetArch, ParseArgs, \
+    Run, UnrecognizedOption
 from driver_env import env
 from driver_log import Log
+import ldtools
+import pathtools
 
-import subprocess
 
 EXTRA_ENV = {
   'INPUTS'   : '',
@@ -49,19 +53,22 @@ EXTRA_ENV = {
                   '--no-fix-cortex-a8 ' +
                   '-m ${LD_EMUL} ' +
                   '--eh-frame-hdr ' +
-                  '${ARCH == X8632_NONSFI ? -pie : -static} ' +
+                  '${NONSFI_NACL ? -pie : -static} ' +
                   # "_begin" allows a PIE to find its load address in
                   # order to apply dynamic relocations.
-                  '${ARCH == X8632_NONSFI ? -defsym=_begin=0} ' +
+                  '${NONSFI_NACL ? -defsym=_begin=0} ' +
                   # Give an error if any TEXTRELs occur.
                   '-z text ' +
                   '--build-id ' +
-                  '${!USE_IRT ? --rosegment-gap=32}',
+                  # Give non-IRT builds 12MB of text before starting rodata
+                  # instead of the larger default gap. The gap cannot be
+                  # too small (e.g., 0) because sel_ldr requires space for
+                  # adding a halt sled.
+                  '${!USE_IRT ? --rosegment-gap=0xc00000}',
 
-  'LD_EMUL'        : '${LD_EMUL_%ARCH%}',
+  'LD_EMUL'        : '${LD_EMUL_%BASE_ARCH%}',
   'LD_EMUL_ARM'    : 'armelf_nacl',
   'LD_EMUL_X8632'  : 'elf_nacl',
-  'LD_EMUL_X8632_NONSFI': 'elf_nacl',
   'LD_EMUL_X8664'  : 'elf64_nacl',
   'LD_EMUL_MIPS32' : 'elf32ltsmip_nacl',
 
@@ -71,6 +78,7 @@ EXTRA_ENV = {
 
   'LIBS_ARCH'        : '${LIBS_%ARCH%}',
   'LIBS_ARM'         : '${BASE_LIB_NATIVE}arm',
+  'LIBS_ARM_NONSFI'  : '${BASE_LIB_NATIVE}arm-nonsfi',
   'LIBS_X8632'       : '${BASE_LIB_NATIVE}x86-32',
   'LIBS_X8632_NONSFI': '${BASE_LIB_NATIVE}x86-32-nonsfi',
   'LIBS_X8664'       : '${BASE_LIB_NATIVE}x86-64',