Chromium Code Reviews| Index: ppapi/native_client/native_client.gyp |
| diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp |
| index 825d1207b84bf4eff36d82d5e84205802abd0087..24944ba65fd3e60eb6489134d32ccfde76be2de5 100644 |
| --- a/ppapi/native_client/native_client.gyp |
| +++ b/ppapi/native_client/native_client.gyp |
| @@ -114,36 +114,18 @@ |
| '-lgio', |
| '-Wl,--end-group', |
| '-lm', |
| + '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', |
| + '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)', |
| ], |
| - # See http://code.google.com/p/nativeclient/issues/detail?id=2691. |
| - # The PNaCl linker (gold) does not implement the "-Ttext-segment" |
| - # option. However, with the linker for x86, the "-Ttext" option |
| - # does not affect the executable's base address. |
| - # TODO(olonho): simplify flags handling and avoid duplication |
| - # with NaCl logic. |
| 'conditions': [ |
| - ['target_arch!="arm"', |
| - { |
| - '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 |
| + ['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', |
|
Derek Schuff
2013/03/29 05:43:36
This should probably still be moved to irt.gyp per
Sam Clegg
2013/03/29 18:29:21
Done.
|
| ], |
| - 'link_flags': [ |
| - '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', |
| - '-Wl,-Ttext=<(NACL_IRT_TEXT_START)', |
| - '--pnacl-allow-native', |
| - '-arch', 'arm', |
| - '-Wt,-mtls-use-call', |
| - '-Wl,--pnacl-irt-link', |
| - ], |
| }, |
| ], |
| # untrusted.gypi and build_nexe.py currently build |