diff options
| author | pdox@google.com <pdox@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 02:24:27 +0000 |
|---|---|---|
| committer | pdox@google.com <pdox@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 02:24:27 +0000 |
| commit | bfbcd7303a0a0e3b2f814dd1a1c3389687e5ae45 (patch) | |
| tree | b19d377769863ff3e06c441f5e30b349b882d442 /ppapi/native_client | |
| parent | 17b5edc5f1ea6ad35ad96cd16cf9d83e1e62f8a1 (diff) | |
| download | chromium_src-bfbcd7303a0a0e3b2f814dd1a1c3389687e5ae45.zip chromium_src-bfbcd7303a0a0e3b2f814dd1a1c3389687e5ae45.tar.gz chromium_src-bfbcd7303a0a0e3b2f814dd1a1c3389687e5ae45.tar.bz2 | |
Add crtbegin.o / crtend.o to the link line in the PNaCl coordinator.
These files normally handle ctors/dtors/jtors and EH initialization.
For PNaCl, they are only responsible for EH initialization.
This task was previously inside the bitcode (part of nacl_startup.bc)
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2423
Review URL: http://codereview.chromium.org/8492022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc index 969591b..a402aed 100644 --- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc +++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc @@ -419,12 +419,14 @@ string_vector LinkResources(const nacl::string& sandbox_isa, nacl::string base_dir = "pnacl_support/" + sandbox_isa; // NOTE: order of items == link order. + results.push_back(base_dir + "/crtbegin.o"); if (withGenerated) { results.push_back(GeneratedObjectFileName()); } results.push_back(base_dir + "/libcrt_platform.a"); results.push_back(base_dir + "/libgcc.a"); results.push_back(base_dir + "/libgcc_eh.a"); + results.push_back(base_dir + "/crtend.o"); return results; } |