Add rough version pnacl shim commandlines to pnacl coordinator.

ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc

 // Copyright (c) 2011 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.
 
 #include "native_client/src/trusted/plugin/pnacl_coordinator.h"
 
 #include <utility>
 #include <vector>
 
 #include "native_client/src/include/portability_io.h"
@@ skipping 336 matching lines @@
 nacl::string GeneratedObjectFileName() {
   return nacl::string("___PNACL_GENERATED");
 }
 
 nacl::string ResourceBaseUrl() {
   nacl::string sandbox_isa = GetSandboxISA();
   nacl::string base_url = "pnacl_support/" + sandbox_isa + "/";
   return base_url;
 }
 
-string_vector LinkResources(bool withGenerated) {
+string_vector LinkResources(const nacl::string& sandbox_isa,
+                            bool withGenerated) {
   string_vector results;
   // NOTE: order of items == link order.
+  if (sandbox_isa.compare("x86-64") == 0) {
+    results.push_back("libpnacl_irt_shim.a");
+  }
   results.push_back("crtbegin.o");
   if (withGenerated) {
     results.push_back(GeneratedObjectFileName());
   }
   results.push_back("libcrt_platform.a");
   results.push_back("libgcc.a");
   results.push_back("libgcc_eh.a");
   results.push_back("crtend.o");
   return results;
 }
@@ skipping 27 matching lines @@
   // TODO(jvoung): Be able to handle the dynamic linking flags too,
   // and don't hardcode so much here.
   string_vector flags;
   nacl::string sandbox_isa = GetSandboxISA();
   flags.push_back("-nostdlib");
   flags.push_back("-m");
   if (sandbox_isa.compare("x86-32") == 0) {
     flags.push_back("elf_nacl");
   } else if (sandbox_isa.compare("x86-64") == 0) {
     flags.push_back("elf64_nacl");
+    flags.push_back("-entry=_pnacl_wrapper_start");
   } else if (sandbox_isa.compare("arm") == 0) {
     flags.push_back("armelf_nacl");
   } else {
     AbortLinkThread(p,
                     "PnaclCoordinator linker unhandled ISA " +
                     sandbox_isa + ".");
   }
 
   for (string_vector::iterator i = flags.begin(), e = flags.end();
        i != e; ++i) {
     const nacl::string& flag = *i;
     if (coordinator->SubprocessesShouldDie()) {
       NaClThreadExit(1);
     }
     SrpcParams dummy_params;
     if (!PnaclSrpcLib::InvokeSrpcMethod(browser_interface,
                                         ld_subprocess,
                                         "AddArg",
                                         "C",
                                         &dummy_params,
                                         flag.c_str())) {
       AbortLinkThread(p,
                       "PnaclCoordinator linker AddArg(" + flag +
                       ") failed.");
     }
   }
 
   //// Files.
-  string_vector files = LinkResources(true);
+  string_vector files = LinkResources(sandbox_isa, true);
   PnaclResources* resources = coordinator->resources();
   for (string_vector::iterator i = files.begin(), e = files.end();
        i != e; ++i) {
     const nacl::string& link_file = *i;
     if (coordinator->SubprocessesShouldDie()) {
       NaClThreadExit(1);
     }
     // Add as argument.
     SrpcParams dummy_params;
     if (!PnaclSrpcLib::InvokeSrpcMethod(browser_interface,
@@ skipping 166 matching lines @@
 
   translation_unit_.reset(new PnaclTranslationUnit(this));
 
   // When resources loading completes, this causes the pexe download.
   pp::CompletionCallback resources_cb =
       callback_factory_.NewCallback(&PnaclCoordinator::ResourcesDidLoad,
                                     pexe_url,
                                     translation_unit_.get());
   resources_->AddResourceUrl(llc_url_);
   resources_->AddResourceUrl(ld_url_);
-  string_vector link_resources = LinkResources(false);
+  string_vector link_resources = LinkResources(GetSandboxISA(), false);
   for (string_vector::iterator
            i = link_resources.begin(), e = link_resources.end();
        i != e;
        ++i) {
     resources_->AddResourceUrl(*i);
   }
   resources_->RunWhenAllLoaded(resources_cb);
   resources_->StartDownloads();
 }
 
 }  // namespace plugin