Chromium Code Reviews| Index: pnacl/driver/pnacl-ld.py |
| diff --git a/pnacl/driver/pnacl-ld.py b/pnacl/driver/pnacl-ld.py |
| index 524635629b89395e329b28c79aa5cb1bffbafc67..e9f4a141f6efbeb6a83aa3cd1b1e9b90eb34fef3 100755 |
| --- a/pnacl/driver/pnacl-ld.py |
| +++ b/pnacl/driver/pnacl-ld.py |
| @@ -100,10 +100,25 @@ EXTRA_ENV = { |
| 'LD_GOLD_OFORMAT_X8664' : 'elf64-x86-64-nacl', |
| 'LD_GOLD_OFORMAT_MIPS32' : 'elf32-tradlittlemips', |
| - 'BCLD' : '${LD_GOLD}', |
| - 'BCLD_FLAGS': '--oformat ${LD_GOLD_OFORMAT} -Ttext=0x20000 ' + |
| - '${!SHARED && !RELOCATABLE ? --undef-sym-check} ' + |
| - '${GOLD_PLUGIN_ARGS} ${LD_FLAGS}', |
| + 'BCLD' : '${LD_GOLD}', |
| + 'FINAL_BCLD_LINK_FLAGS' : |
| + '--undef-sym-check --allow-unresolved=_Unwind_DeleteException ' + |
|
jvoung (off chromium)
2013/05/07 18:11:55
keep one exception per line so that they are easie
Mark Seaborn
2013/05/07 18:16:06
Also, you can omit the "+": Python does C-style st
eliben
2013/05/07 18:55:04
Done.
eliben
2013/05/07 18:55:04
Done, although it was consistent with the surround
|
| + '--allow-unresolved=_Unwind_GetIP --allow-unresolved=_Unwind_GetIPInfo ' + |
| + '--allow-unresolved=_Unwind_Resume --allow-unresolved=_Unwind_GetCFA ' + |
| + '--allow-unresolved=_Unwind_Backtrace --allow-unresolved=_Unwind_SetIP ' + |
| + '--allow-unresolved=_Unwind_GetRegionStart ' + |
| + '--allow-unresolved=_Unwind_GetDataRelBase ' + |
| + '--allow-unresolved=_Unwind_GetTextRelBase ' + |
| + '--allow-unresolved=_Unwind_GetLanguageSpecificData ' + |
| + '--allow-unresolved=_Unwind_PNaClSetResult0 ' + |
| + '--allow-unresolved=_Unwind_PNaClSetResult1 ' + |
| + '--allow-unresolved=_Unwind_RaiseException ' + |
| + '--allow-unresolved=_Unwind_Resume_or_Rethrow ', |
| + |
| + 'BCLD_FLAGS': |
| + '--oformat ${LD_GOLD_OFORMAT} -Ttext=0x20000 ' + |
| + '${!SHARED && !RELOCATABLE ? ${FINAL_BCLD_LINK_FLAGS}} ' + |
| + '${GOLD_PLUGIN_ARGS} ${LD_FLAGS}', |
| 'RUN_BCLD': ('${BCLD} ${BCLD_FLAGS} ${inputs} -o ${output}'), |
| 'ALLOW_CXX_EXCEPTIONS': '0', |