Chromium Code Reviews| Index: src/untrusted/irt/nacl.scons |
| diff --git a/src/untrusted/irt/nacl.scons b/src/untrusted/irt/nacl.scons |
| index 63cadd66f52e8cd5a441e70ed301ffc1b85d5c50..0152312f7036f41a89235e366043b5c9c58b7aac 100644 |
| --- a/src/untrusted/irt/nacl.scons |
| +++ b/src/untrusted/irt/nacl.scons |
| @@ -42,13 +42,16 @@ if asm_env.Bit('bitcode'): |
| asm_helper = asm_env.ComponentObject( |
| 'elf_restart_%s.S' % env['TARGET_FULLARCH'].replace('-', '_')) |
| -files = ['irt_entry.c', 'irt_sbrk.c', 'irt_elf_utils.c', asm_helper] |
| -# TLS virtualisation only works on x86-64 currently. |
| -# TODO(mseaborn): Turn on "-mtls-use-call" for the relevant libraries |
| -# on x86-32 so that this works there too. |
| -if env.Bit('build_x86_64'): |
| - files.append('irt_tls.c') |
| -blob_env.ComponentProgram( |
| +files = ['irt_entry.c', 'irt_sbrk.c', 'irt_elf_utils.c', 'irt_tls.c', |
|
Mark Seaborn
2011/04/13 20:32:30
Nit: we tend to split lists like this into one-ent
|
| + asm_helper] |
| +irt_library = blob_env.ComponentProgram( |
| 'irt.nexe', files, |
| EXTRA_LIBS=['ppruntime', 'srpc', 'imc', 'platform', 'gio', |
| 'pthread', 'm']) |
| + |
| +if env.Bit('build_x86_32'): |
| + # Make sure that the linked IRT nexe has no TLS uses. |
|
Mark Seaborn
2011/04/13 20:32:30
"TLS uses" -> "direct TLS uses via %gs"?
|
| + node = env.CommandTest('irt_tls_test.out', |
| + ['${PYTHON}', env.File('check_tls.py'), |
| + '${OBJDUMP}', irt_library]) |
| + env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_tls_test') |