Index: tests/pnacl_dynamic_loading/nacl.scons |
diff --git a/tests/pnacl_dynamic_loading/nacl.scons b/tests/pnacl_dynamic_loading/nacl.scons |
index 4966c94aa0387c85d299def647493c986bafb28d..3613d90b081baf78b1a6df55e0b5ae552cc2eaf0 100644 |
--- a/tests/pnacl_dynamic_loading/nacl.scons |
+++ b/tests/pnacl_dynamic_loading/nacl.scons |
@@ -84,10 +84,19 @@ env.AddNodeToTestSuite( |
# Use of the ConvertToPSO pass requires this toolchain version. |
-if env['TOOLCHAIN_FEATURE_VERSION'] < 23: |
+if env['TOOLCHAIN_FEATURE_VERSION'] < 24: |
Return() |
-test_pll = MakeAndTranslatePll('test_pll', 'test_pll.c') |
+# TODO(smklein): These LLVM passes should be automatically applied by the |
+# drivers. Once support for dependencies has been plumbed through the drivers, |
+# use the "-l" linker flags and don't explicitly declare any LLVM passes. |
+test_pll = MakeAndTranslatePso( |
+ 'test_pll', [env.ComponentObject('test_pll.c')], |
+ llvm_passes='-nacl-global-cleanup -expand-varargs ' |
+ '-rewrite-pnacl-library-calls -rewrite-llvm-intrinsic-calls ' |
+ '-convert-to-pso -convert-to-pso-deps=libfoo.so,libbar.so ' |
+ '-pnacl-abi-simplify-postopt') |
+ |
test_pll_tls = MakeAndTranslatePll('test_pll_tls', 'test_pll_tls.c') |
pll_symbols_test = env.ComponentProgram( |