Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / native_client / site_scons / site_tools / naclsdk.py

diff --git a/src/native_client/site_scons/site_tools/naclsdk.py b/src/native_client/site_scons/site_tools/naclsdk.py
index 2208d6d..ce9a2d9 100755 (executable)
--- a/src/native_client/site_scons/site_tools/naclsdk.py
+++ b/src/native_client/site_scons/site_tools/naclsdk.py
@@ -176,6 +176,19 @@ def _SetEnvForPnacl(env, root):
   else:
     ld_arch_flag = arch_flag
 
+  llc_mtriple_flag = ''
+  if env.Bit('minsfi'):
+    llc_cpu = ''
+    if env.Bit('build_x86_32'):
+      llc_cpu = 'i686'
+    elif env.Bit('build_x86_64'):
+      llc_cpu = 'x86_64'
+
+    if env.Bit('host_linux'):
+      llc_mtriple_flag = ' -mtriple=%s-linux-gnu' % llc_cpu
+    elif env.Bit('host_mac'):
+      llc_mtriple_flag = ' -mtriple=%s-apple-darwin' % llc_cpu
+
   translator_root = os.path.join(os.path.dirname(root), 'pnacl_translator')
 
   binprefix = os.path.join(root, 'bin', 'pnacl-')
@@ -202,6 +215,7 @@ def _SetEnvForPnacl(env, root):
   pnacl_finalize = binprefix + 'finalize' + binext
   pnacl_opt = binprefix + 'opt' + binext
   pnacl_strip = binprefix + 'strip' + binext
+  pnacl_llc = binprefix + 'llc' + binext
 
   # NOTE: XXX_flags start with space for easy concatenation
   # The flags generated here get baked into the commands (CC, CXX, LINK)
@@ -211,6 +225,7 @@ def _SetEnvForPnacl(env, root):
   pnacl_cc_flags = ' -std=gnu99'
   pnacl_ld_flags = ' ' + ' '.join(env['PNACL_BCLDFLAGS'])
   pnacl_translate_flags = ''
+  pnacl_llc_flags = ''
 
   if env.Bit('nacl_pic'):
     pnacl_cc_flags += ' -fPIC'
@@ -220,6 +235,10 @@ def _SetEnvForPnacl(env, root):
     pnacl_ld_flags += ' -fPIC'
     pnacl_translate_flags += ' -fPIC'
 
+  if env.Bit('minsfi'):
+    pnacl_llc_flags += ' -relocation-model=pic -filetype=obj'
+    pnacl_ld_flags += ' -nostdlib -Wl,-r -L' + os.path.join(root, 'usr', 'lib')
+
   if env.Bit('use_sandboxed_translator'):
     sb_flags = ' --pnacl-sb'
     pnacl_ld_flags += sb_flags
@@ -229,8 +248,8 @@ def _SetEnvForPnacl(env, root):
     pnacl_translate_flags += ' -sfi-zero-based-sandbox'
 
   env.Replace(# Replace header and lib paths.
-              NACL_SDK_INCLUDE=os.path.join(root, 'usr', 'include'),
-              NACL_SDK_LIB=os.path.join(root, 'lib'),
+              NACL_SDK_INCLUDE=os.path.join(root, 'le32-nacl', 'include'),
+              NACL_SDK_LIB=os.path.join(root, 'le32-nacl', 'lib'),
               # Remove arch-specific flags (if any)
               BASE_LINKFLAGS='',
               BASE_CFLAGS='',
@@ -261,6 +280,7 @@ def _SetEnvForPnacl(env, root):
               TRANSLATE=pnacl_translate + arch_flag + pnacl_translate_flags,
               PNACLFINALIZE=pnacl_finalize,
               PNACLOPT=pnacl_opt,
+              LLC=pnacl_llc + llc_mtriple_flag + pnacl_llc_flags,
               )
 
   if env.Bit('built_elsewhere'):