Non-SFI Mode: Build ipc/ library by PNaCl toolchain for nacl_helper_nonsfi.

components/nacl_nonsfi.gyp

Index: components/nacl_nonsfi.gyp
diff --git a/components/nacl_nonsfi.gyp b/components/nacl_nonsfi.gyp
index 60c09f41324f7c64d986ac5fbadf29995cace446..6f4b4f9ea51e15b0d2173832675f12bab9fe73da 100644
--- a/components/nacl_nonsfi.gyp
+++ b/components/nacl_nonsfi.gyp
@@ -13,6 +13,22 @@
     ['disable_nacl==0 and disable_nacl_untrusted==0', {
       'targets': [
         {
+          # nacl_helper_nonsfi is similar to nacl_helper (built in nacl.gyp)
+          # but for the NaCl plugin in Non-SFI mode.
+          # This binary is built by the PNaCl toolchain, but it is native

[Mark Seaborn, 2014/10/23 03:33:48]

Subtle nit: "by" -> "using" (since Gyp is involved too)

[hidehiko, 2014/10/23 14:19:08]

Done.

+          # linux binary (translated from a biased pexe) and will run on Linux

[Mark Seaborn, 2014/10/23 03:33:48]

Nit: remove "(translated from a biased pexe)" -- we don't link it as a pexe.

[hidehiko, 2014/10/23 14:19:08]

Done.

+          # directly.
+          # Most library code can be shared with the one for untrusted build
+          # (i.e. the one for irt.nexe built by the NaCl/PNaCl toolchain), but
+          # as nacl_helper_nonsfi runs on Linux, there are some differences,
+          # such as MessageLoopForIO (which is based on libevent in Non-SFI
+          # mode) or ipc_channel implementation.
+          # Because of the toolchain, in both build, OS_NACL macro (derived

[Mark Seaborn, 2014/10/23 03:33:48]

"in both builds" (plural)

[hidehiko, 2014/10/23 14:19:08]

Done.

+          # from __native_client__ macro) is defined. To figure out if it
+          # compiles for SFI-mode or Non-SFI mode, __native_client_nonsfi__

[Mark Seaborn, 2014/10/23 03:33:48]

"if it compiles for" -> "if it is being compiled for"

Maybe reword to avoid the passive voice.  e.g. "Code can test whether
__native_client_nonsfi__ is #defined in order to determine whether it is being
compiled for SFI mode or Non-SFI mode."

[hidehiko, 2014/10/23 14:19:08]

Done. Thank you for suggestion.

+          # macro can be used, which is defined on Non-SFI mode build, but not
+          # on SFI-mode build.
+          #
           # Currently, nacl_helper_nonsfi is under development and the binary
           # does nothing (i.e. it has only empty main(), now).
           # TODO(crbug.com/358465): Implement it then switch nacl_helper in
@@ -42,6 +58,7 @@
                 'extra_deps_newlib32_nonsfi': [
                   '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a',
+                  '>(tc_lib_dir_nonsfi_helper32)/libipc_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libshared_memory_support_nacl.a',
                 ],
               }],
@@ -49,6 +66,7 @@
           },
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl_nonsfi',
+            '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi',
             '../native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
             '../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
             '../native_client/tools.gyp:prep_toolchain',