Enabling 64-bit mojo shell to launch 32-bit child to handle nonsfi content.

services/nacl/BUILD.gn

Index: services/nacl/BUILD.gn
diff --git a/services/nacl/BUILD.gn b/services/nacl/BUILD.gn
index 37f2515b7321959933eff0fd298ece9796977d34..445fc638d61320e71c78e0f01c17910fa2255755 100644
--- a/services/nacl/BUILD.gn
+++ b/services/nacl/BUILD.gn
@@ -26,20 +26,51 @@ if (!is_nacl) {
     data_deps = [ "//nacl_bindings:irt_mojo(//native_client/build/toolchain/nacl:irt_${target_cpu})" ]
   }
 
-  mojo_native_application("nacl_content_handler_nonsfi") {
-    sources = [
-      "content_handler_main_nonsfi.cc",
-    ]
+  if (current_cpu == "x86") {
+    # Non-SFI NaCl can only be executed by a 32-bit process, so our
+    # content handler must be built and launched as a 32-bit process as well.
+    mojo_native_application("nacl_content_handler_nonsfi_x86") {

[Petr Hosek, 2015/09/15 22:40:27]

I'd probably name it as "nacl_content_handler_nonsfi_mojo"; then you won't have
to rename this target in the future (i.e. when you add support for ARM).

[Sean Klein, 2015/09/15 22:56:05]

Calling it "nacl_content_handler_nonsfi_32_bit" instead.
The mojo suffix doesn't mean much, and though it is not x86-specific, it IS
32-bit specific.

+      sources = [
+        "content_handler_main_nonsfi.cc",
+      ]
 
-    deps = [
-      "//base",
-      "//mojo/application:application",
-      "//mojo/application:content_handler",
-      "//mojo/data_pipe_utils",
-      "//mojo/message_pump",
-      "//mojo/nacl:irt_mojo_nonsfi",
-      "//mojo/public/cpp/application:application",
-      "//native_client/src/nonsfi/loader:elf_loader",
-    ]
+      deps = [
+        "//base",
+        "//mojo/application:application",
+        "//mojo/application:content_handler",
+        "//mojo/data_pipe_utils",
+        "//mojo/message_pump",
+        "//mojo/nacl:irt_mojo_nonsfi",
+        "//mojo/public/cpp/application:application",
+        "//native_client/src/nonsfi/loader:elf_loader",
+      ]
+    }
+
+    # Copy to the root build directory so that the '#!' prefix line for invoking
+    # our content handler can simply be "mojo:nacl_content_handler_nonsfi".
+    copy("nacl_content_handler_nonsfi_copy") {
+      sources = [
+        "${root_out_dir}/nacl_content_handler_nonsfi_x86.mojo",

[Petr Hosek, 2015/09/15 22:40:27]

You can use "nacl_content_handler_nonsfi_${current_cpu}.mojo" for the filename.

[Sean Klein, 2015/09/15 22:56:05]

With the name change above, this is not necessary.

+      ]
+      outputs = [
+        "${root_build_dir}/nacl_content_handler_nonsfi.mojo",
+      ]
+      deps = [
+        ":nacl_content_handler_nonsfi_x86",
+      ]
+    }
+  }
+}
+
+# This group serves as a 64 to 32 bit transformation for Linux. If we are
+# using a 64 bit toolchain, build the nonsfi nacl content handler as 32 bit.
+group("nacl_content_handler_nonsfi") {
+  deps = []
+  if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) {
+    # The toolchain is hardcoded as 32-bit clang here -- although it must
+    # be 32 bit (for nonsfi), it assumes clang. Ideally, the toolchain would
+    # be defined as the 32 bit variant of whatever is being used (be it clang,
+    # gcc, or something else).
+    deps += [ ":nacl_content_handler_nonsfi_copy(//build/toolchain/linux:clang_x86)" ]
   }
 }