diff options
| author | mcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 23:51:40 +0000 |
|---|---|---|
| committer | mcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 23:51:40 +0000 |
| commit | 75266de65c7d6f86fa68f0e92a43e5d044e1530f (patch) | |
| tree | 191bca554ebcd474cf65f76ee1a84516bcdea806 /ppapi | |
| parent | f39fcdfaabc6a43dce12de87f5aa63384b3169ee (diff) | |
| download | chromium_src-75266de65c7d6f86fa68f0e92a43e5d044e1530f.zip chromium_src-75266de65c7d6f86fa68f0e92a43e5d044e1530f.tar.gz chromium_src-75266de65c7d6f86fa68f0e92a43e5d044e1530f.tar.bz2 | |
NaCl: Fix ARM Gyp build of IRT to include IRT-private __aeabi_read_tp
The Gyp build rules for the IRT omitted the aeabi_read_tp.S file
for ARM. This is essential to the IRT working correctly.
BUG= http://code.google.com/p/nativeclient/issues/detail?id=3028
TEST= new gyp target nacl_irt_tls_check
R=mseaborn@chromium.org,sehr@google.com
Review URL: https://codereview.chromium.org/10909216
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/native_client.gyp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp index 8a94c3a..be2e727 100644 --- a/ppapi/native_client/native_client.gyp +++ b/ppapi/native_client/native_client.gyp @@ -108,11 +108,20 @@ 'conditions': [ ['target_arch!="arm"', { + 'sources': [ + ], 'link_flags': [ '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)', ] }, { # target_arch == "arm" + # TODO(mcgrathr): This knowledge really belongs in + # native_client/src/untrusted/irt/irt.gyp instead of here. + # But that builds libirt_browser.a as bitcode, so a native + # object does not fit happily there. + 'sources': [ + '../../native_client/src/untrusted/irt/aeabi_read_tp.S', + ], 'link_flags': [ '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', '-Wl,-Ttext=<(NACL_IRT_TEXT_START)', @@ -123,8 +132,6 @@ }, ], ], - 'sources': [ - ], 'extra_args': [ '--strip-debug', ], |