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..284721fe1bc9750088b09479f5bca814985d2b00 100644 |
--- a/ppapi/native_client/native_client.gyp |
+++ b/ppapi/native_client/native_client.gyp |
@@ -114,6 +114,8 @@ |
'-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. |
Derek Schuff
2013/03/28 17:40:22
this comment can go away now.
Sam Clegg
2013/03/28 23:08:37
Done.
|
# The PNaCl linker (gold) does not implement the "-Ttext-segment" |
@@ -122,27 +124,16 @@ |
# 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 |
Derek Schuff
2013/03/28 17:40:22
If you're going to do this CL atomically with a na
Sam Clegg
2013/03/28 23:08:37
Removed compile_flags.
|
# 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)', |
- '--pnacl-allow-native', |
- '-arch', 'arm', |
- '-Wt,-mtls-use-call', |
- '-Wl,--pnacl-irt-link', |
+ 'compile_flags': [ |
+ '-mtp=soft' |
], |
}, |
], |