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

Unified Diff: pydir/szbuild.py

Issue 1027593002: Subzero: Support non-IRT immediate calls with -filetype=iasm. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Created 5 years, 9 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
« pydir/crosstest.py ('K') | « pydir/crosstest.py ('k') | src/IceFixups.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pydir/szbuild.py
diff --git a/pydir/szbuild.py b/pydir/szbuild.py
index eaba32b216fcce3d294d2f860f592faff3ccad77..09f2bbf8dd5b1065be08608ea46096255ec3def8 100755
--- a/pydir/szbuild.py
+++ b/pydir/szbuild.py
@@ -297,6 +297,7 @@ def ProcessPexe(args, pexe, exe):
'{linklib}/libpnacl_irt_shim_dummy.a --start-group ' +
'{linklib}/libgcc.a {linklib}/libcrt_platform.a ' +
'--end-group {linklib}/crtend.o --undefined=_start ' +
+ '--defsym __Sz_AbsoluteZero=0 ' +
jvoung (off chromium) 2015/03/20 06:10:45 Keep the same number of = as the other cases, like
Jim Stichnoth 2015/03/20 06:22:53 Done. There's now just one inconsistency - crosst
'-o {exe}'
).format(gold=gold, linklib=linklib, partial=obj_partial, exe=exe,
root=nacl_root),
@@ -309,7 +310,8 @@ def ProcessPexe(args, pexe, exe):
'{root}/toolchain/linux_x86/pnacl_newlib/translator/x86-32-linux/' +
'lib/{{unsandboxed_irt,irt_random,irt_query_list}}.o ' +
'{root}/toolchain_build/src/subzero/build/runtime/' +
- 'szrt_native_x8632.o -lpthread -lrt'
+ 'szrt_native_x8632.o -lpthread -lrt ' +
+ '-Wl,--defsym=__Sz_AbsoluteZero=0'
).format(ld=linker, partial=obj_partial, exe=exe, root=nacl_root),
echo=args.verbose)
« pydir/crosstest.py ('K') | « pydir/crosstest.py ('k') | src/IceFixups.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698