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

Unified Diff: tests/toolchain/nacl.scons

Issue 454593002: PNaCl driver: Add libgcc to mixed native/bitcode links (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: explicitly modify env rather than using var expansion Created 6 years, 4 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 | « pnacl/driver/pnacl-driver.py ('k') | tests/toolchain/needs_libgcc.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/toolchain/nacl.scons
diff --git a/tests/toolchain/nacl.scons b/tests/toolchain/nacl.scons
index bc92a6087deb166ede62ab7ef5f16a683053e212..361e1e52227157518fec9cb8c68de069d841c680 100644
--- a/tests/toolchain/nacl.scons
+++ b/tests/toolchain/nacl.scons
@@ -552,3 +552,24 @@ nexe = env.ComponentProgram('wrap', ['wrap_main.c'],
node = env.CommandSelLdrTestNacl('wrap.out', nexe,
stdout_golden=env.File('wrap.stdout'))
env.AddNodeToTestSuite(node, ['toolchain_tests','small_tests'], 'run_wrap_test')
+
+if (env.Bit('target_x86_32') and env.Bit('bitcode') and
+ not env.Bit('pnacl_generate_pexe') and
+ env['TOOLCHAIN_FEATURE_VERSION'] >= 7):
+ # This test compiles a file that will need to generate a call to a compiler-rt
+ # function (__udivdi3) on x86-32. Ensure that when we pre-translate to a
+ # native object file, libgcc is included in the bitcode link to satisfy the
+ # reference.
+ mixedlink_env = env.Clone()
+ mixedlink_env.Append(CCFLAGS=['--pnacl-allow-translate',
+ '--pnacl-allow-native',
+ '-arch', 'x86-32'])
+ mixedlink_env.Append(LINKFLAGS=['--pnacl-allow-translate',
+ '--pnacl-allow-native',
+ '-arch', 'x86-32'])
+ nexe = mixedlink_env.ComponentProgram('libgcc_mixed_link', 'needs_libgcc.c',
+ EXTRA_LIBS=['${NONIRT_LIBS}'])
+ node = mixedlink_env.CommandSelLdrTestNacl('libgcc_mixed_link.out', nexe,
+ ['9', '3'])
+ mixedlink_env.AddNodeToTestSuite(node, ['nonpexe_tests', 'small_tests'],
+ 'run_libgcc_mixed_link_test')
« no previous file with comments | « pnacl/driver/pnacl-driver.py ('k') | tests/toolchain/needs_libgcc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698