[NaCl SDK] Add ARM sel_ldr to linux SDK

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Entry point for both build and try bots.
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
 
 The script inspects the following environment variables:
 
 BUILDBOT_BUILDERNAME to determine whether the script is run locally
 and whether it should upload an SDK to file storage (GSTORE)
 """
 
 # pylint: disable=W0621
 
 # std python includes
-import copy
 import datetime
 import glob
 import optparse
 import os
 import re
 import sys
 
 if sys.version_info < (2, 6, 0):
   sys.stderr.write("python 2.6 or later is required run this script\n")
   sys.exit(1)
@@ skipping 371 matching lines @@
     'libpthread.a',
   ]
 }
 
 
 def GypNinjaInstall(pepperdir, toolchains):
   build_dir = GYPBUILD_DIR
   ninja_out_dir = os.path.join(OUT_DIR, build_dir, 'Release')
   tools_files = [
     ['sel_ldr', 'sel_ldr_x86_32'],
+    ['sel_ldr_x86_64', 'sel_ldr_x86_64'],
+    ['sel_ldr_arm', 'sel_ldr_arm'],
     ['ncval_new', 'ncval'],
     ['irt_core_newlib_x32.nexe', 'irt_core_x86_32.nexe'],
     ['irt_core_newlib_x64.nexe', 'irt_core_x86_64.nexe'],
   ]
 
   platform = getos.GetPlatform()
 
   # TODO(binji): dump_syms doesn't currently build on Windows. See
   # http://crbug.com/245456
   if platform != 'win':
     tools_files += [
       ['dump_syms', 'dump_syms'],
       ['minidump_dump', 'minidump_dump'],
       ['minidump_stackwalk', 'minidump_stackwalk']
     ]
 
-  tools_files.append(['sel_ldr64', 'sel_ldr_x86_64'])
-
   if platform == 'linux':
     tools_files.append(['nacl_helper_bootstrap',
                         'nacl_helper_bootstrap_x86_32'])
-    tools_files.append(['nacl_helper_bootstrap64',
+    tools_files.append(['nacl_helper_bootstrap_x86_64',
                         'nacl_helper_bootstrap_x86_64'])
+    tools_files.append(['nacl_helper_bootstrap_arm',
+                        'nacl_helper_bootstrap_arm'])
 
   buildbot_common.MakeDir(os.path.join(pepperdir, 'tools'))
 
   # Add .exe extensions to all windows tools
   for pair in tools_files:
     if platform == 'win' and not pair[0].endswith('.nexe'):
       pair[0] += '.exe'
       pair[1] += '.exe'
 
   InstallFiles(ninja_out_dir, os.path.join(pepperdir, 'tools'), tools_files)
@@ skipping 28 matching lines @@
   GypNinjaBuild('arm', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_arm)
   GypNinjaBuild('ia32', gyp_py, all_gyp, 'ncval_new', out_dir)
 
   platform = getos.GetPlatform()
   if platform == 'win':
     NinjaBuild('sel_ldr64', out_dir)
   else:
     out_dir_64 = MakeNinjaRelPath(rel_out_dir + '-64')
     GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'sel_ldr', out_dir_64)
 
-    # We only need sel_ldr from the 64-bit out directory.
-    # sel_ldr needs to be renamed, so we'll call it sel_ldr64.
-    files_to_copy = [('sel_ldr', 'sel_ldr64')]
+    files_to_copy = ['sel_ldr']
     if platform == 'linux':
-      files_to_copy.append(('nacl_helper_bootstrap', 'nacl_helper_bootstrap64'))
+      files_to_copy.append('nacl_helper_bootstrap')
 
-    for src, dst in files_to_copy:
+    out_dir = os.path.join(SRC_DIR, out_dir, 'Release')
+    out_dir_64 = os.path.join(SRC_DIR, out_dir_64, 'Release')
+    out_dir_arm = os.path.join(SRC_DIR, out_dir_arm, 'Release')
+
+    for src in files_to_copy:
       buildbot_common.CopyFile(
-          os.path.join(SRC_DIR, out_dir_64, 'Release', src),
-          os.path.join(SRC_DIR, out_dir, 'Release', dst))
+          os.path.join(out_dir_64, src), os.path.join(out_dir, src + '_x86_64'))
+      buildbot_common.CopyFile(
+          os.path.join(out_dir_arm, src), os.path.join(out_dir, src + '_arm'))
+
+    if platform == 'linux':
+      buildbot_common.CopyFile(
+          os.path.join(out_dir_arm, 'irt_core_newlib_arm.nexe'),
+          os.path.join(out_dir, 'irt_core_newlib_arm.nexe'))
 
 
 def GypNinjaBuild_Breakpad(rel_out_dir):
   # TODO(binji): dump_syms doesn't currently build on Windows. See
   # http://crbug.com/245456
   if getos.GetPlatform() == 'win':
     return
 
   gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium')
   out_dir = MakeNinjaRelPath(rel_out_dir)
@@ skipping 18 matching lines @@
 
   out_dir = MakeNinjaRelPath(rel_out_dir)
   gyp_file = os.path.join(SRC_DIR, 'ppapi', 'native_client', 'src',
                           'untrusted', 'pnacl_irt_shim', 'pnacl_irt_shim.gyp')
   targets = ['pnacl_irt_shim']
   GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir, False)
 
 
 def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets,
                   out_dir, force_arm_gcc=True):
-  gyp_env = copy.copy(os.environ)
+  gyp_env = dict(os.environ)
   gyp_env['GYP_GENERATORS'] = 'ninja'
   gyp_defines = []
   if options.mac_sdk:
     gyp_defines.append('mac_sdk=%s' % options.mac_sdk)
   if arch:
     gyp_defines.append('target_arch=%s' % arch)
     if arch == 'arm':
-      gyp_defines += ['armv7=1', 'arm_thumb=0', 'arm_neon=1']
+      if getos.GetPlatform() == 'linux':
+        gyp_env['CC'] = 'arm-linux-gnueabihf-gcc'
+        gyp_env['CXX'] = 'arm-linux-gnueabihf-g++'
+        gyp_env['AR'] = 'arm-linux-gnueabihf-ar'
+        gyp_env['AS'] = 'arm-linux-gnueabihf-as'
+        gyp_env['CC_host'] = 'cc'
+        gyp_env['CXX_host'] = 'c++'

[binji, 2014/01/08 23:01:15]

requires installing arm cross toolchain

+      gyp_defines += ['armv7=1', 'arm_thumb=0', 'arm_neon=1',
+          'arm_float_abi=hard']
       if force_arm_gcc:
         gyp_defines.append('nacl_enable_arm_gcc=1')
   if getos.GetPlatform() == 'mac':
     gyp_defines.append('clang=1')
 
   gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines)
-  for key in ['GYP_GENERATORS', 'GYP_DEFINES']:
-    value = gyp_env[key]
-    print '%s="%s"' % (key, value)
+  for key in ['GYP_GENERATORS', 'GYP_DEFINES', 'CC']:
+    value = gyp_env.get(key)
+    if value is not None:
+      print '%s="%s"' % (key, value)
   gyp_generator_flags = ['-G', 'output_dir=%s' % (out_dir,)]
   gyp_depth = '--depth=.'
   buildbot_common.Run(
       [sys.executable, gyp_py_script, gyp_file, gyp_depth] + \
           gyp_generator_flags,
       cwd=SRC_DIR,
       env=gyp_env)
   NinjaBuild(targets, out_dir)
 
 
@@ skipping 424 matching lines @@
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')