Index: tests/computed_gotos/nacl.scons |
diff --git a/tests/computed_gotos/nacl.scons b/tests/computed_gotos/nacl.scons |
index adf0b483ed25c72054f5bee7bded73b55abc648d..6bd8ff6311776a11b0689e45535857d25548ea9c 100644 |
--- a/tests/computed_gotos/nacl.scons |
+++ b/tests/computed_gotos/nacl.scons |
@@ -5,11 +5,14 @@ |
Import('env') |
-if not env.AllowNonStableBitcode(): |
- Return() |
-if env.Bit('bitcode'): |
- # Computed gotos are currently not allowed by PNaCl's bitcode ABI. |
- env.Append(LINKFLAGS=['--pnacl-disable-abi-check']) |
+if env['TOOLCHAIN_FEATURE_VERSION'] < 4: |
+ # In old versions of the PNaCl toolchain, computed gotos are left as |
+ # "indirectbr" and "blockaddress", which are not allowed by PNaCl's |
+ # stable ABI. |
+ if not env.AllowNonStableBitcode(): |
+ Return() |
+ if env.Bit('bitcode'): |
+ env.Append(LINKFLAGS=['--pnacl-disable-abi-check']) |
# We are testing a GNU C extension which is disallowed by "-pedantic" mode. |
env.FilterOut(CCFLAGS=['-pedantic']) |