[NaCl SDK] Enable sel_ldr_x86_64 in mac SDK.

BUG=276662
R=binji@chromium.org

Review URL: https://codereview.chromium.org/36053002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231044 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 14 deletions

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 086a62e..49d1cbe 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -426,9 +426,7 @@ def GypNinjaInstall(pepperdir, toolchains):
       ['minidump_stackwalk', 'minidump_stackwalk']
     ]
 
-  if platform != 'mac':
-    # Mac doesn't build 64-bit binaries.
-    tools_files.append(['sel_ldr64', 'sel_ldr_x86_64'])
+  tools_files.append(['sel_ldr64', 'sel_ldr_x86_64'])
 
   if platform == 'linux':
     tools_files.append(['nacl_helper_bootstrap',
@@ -479,16 +477,15 @@ def GypNinjaBuild_NaCl(rel_out_dir):
   platform = getos.GetPlatform()
   if platform == 'win':
     NinjaBuild('sel_ldr64', out_dir)
-  elif platform == 'linux':
+  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'),
-      ('nacl_helper_bootstrap', 'nacl_helper_bootstrap64'),
-    ]
+    files_to_copy = [('sel_ldr', 'sel_ldr64')]
+    if platform == 'linux':
+      files_to_copy.append(('nacl_helper_bootstrap', 'nacl_helper_bootstrap64'))
 
     for src, dst in files_to_copy:
       buildbot_common.CopyFile(
@@ -890,9 +887,8 @@ def main(args):
       dest='build_experimental')
   parser.add_option('--skip-toolchain', help='Skip toolchain untar',
       action='store_true')
-  parser.add_option('--mac_sdk',
-      help='Set the mac_sdk (e.g. 10.6) to use when building with ninja.',
-      dest='mac_sdk')
+  parser.add_option('--mac-sdk',
+      help='Set the mac-sdk (e.g. 10.6) to use when building with ninja.')
 
   global options
   options, args = parser.parse_args(args[1:])
diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list
index 8b1ed0f..73cd38a 100644
--- a/native_client_sdk/src/build_tools/sdk_files.list
+++ b/native_client_sdk/src/build_tools/sdk_files.list
@@ -428,4 +428,4 @@ tools/quote.py
 tools/run.py
 tools/sel_ldr.py
 tools/sel_ldr_x86_32${EXE_EXT}
-[linux,win]tools/sel_ldr_x86_64${EXE_EXT}
+tools/sel_ldr_x86_64${EXE_EXT}
diff --git a/native_client_sdk/src/tools/sel_ldr.py b/native_client_sdk/src/tools/sel_ldr.py
index e500192..d730ffb 100755
--- a/native_client_sdk/src/tools/sel_ldr.py
+++ b/native_client_sdk/src/tools/sel_ldr.py
@@ -59,8 +59,6 @@ def main(argv):
     raise Error('not a file: %s' % nexe)
 
   arch, dynamic = create_nmf.ParseElfHeader(nexe)
-  if osname == 'mac' and arch == 'x86-64':
-    raise Error('Running of x86-64 executables is not supported on mac')
 
   if arch == 'arm':
     raise Error('Cannot run ARM executables under sel_ldr')