Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1580)

Unified Diff: site_scons/site_tools/naclsdk.py

Issue 7276050: Change startup ABI for untrusted code to be C-compatible (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: disable bogus stack_frame.cc test for now Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « SConstruct ('k') | src/trusted/service_runtime/arch/arm/nacl_switch_to_app_arm.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: site_scons/site_tools/naclsdk.py
diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py
index 7047f0ab372eee94a5db68a3ea4c1540a013d279..62c5ed1c0d00bf9e6c3b8907c9c797a6cc7e3e2e 100755
--- a/site_scons/site_tools/naclsdk.py
+++ b/site_scons/site_tools/naclsdk.py
@@ -294,11 +294,11 @@ def _SetEnvForSdkManually(env):
def PNaClForceNative(env):
assert(env.Bit('bitcode'))
- env.Replace(OBJSUFFIX='.o')
- env.Replace(SHLIBSUFFIX='.so')
- env.Append(CCFLAGS=['-arch', '${TARGET_FULLARCH}',
- '--pnacl-allow-translate'])
- env.Append(LINKFLAGS=['--pnacl-allow-native'])
+ env.Replace(OBJSUFFIX='.o',
+ SHLIBSUFFIX='.so')
+ env.Append(ASFLAGS=['-arch', '${TARGET_FULLARCH}'],
+ CCFLAGS=['-arch', '${TARGET_FULLARCH}', '--pnacl-allow-translate'],
+ LINKFLAGS=['--pnacl-allow-native'])
env['SHLINK'] = '${LINK}'
# Get an environment for nacl-gcc when in PNaCl mode.
« no previous file with comments | « SConstruct ('k') | src/trusted/service_runtime/arch/arm/nacl_switch_to_app_arm.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698