diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-14 08:36:53 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-14 08:36:53 -0800 |
commit | 7c7dd0f965c53de4557aa8ad1762f2314b6036e8 (patch) | |
tree | 39ad8347e4bf3014394236e80bea8322e84d3f5a | |
parent | 385d9bc1fa41e11560e2a7c26e9916350b0a66e2 (diff) | |
parent | 9ac11177d2b7b6e890c901e25ee7939dfee69ce7 (diff) | |
download | servo-7c7dd0f965c53de4557aa8ad1762f2314b6036e8.tar.gz servo-7c7dd0f965c53de4557aa8ad1762f2314b6036e8.zip |
Auto merge of #14587 - larsbergstrom:android_exempt_addition, r=Ms2ger
Exempt __cxa_type_match as an allowed dynamic symbol
<!-- Please describe your changes on the following line: -->
This symbol is present in the new LLVM C++ stdlib, which is loaded dynamically from a .so file during startup.
Fixes #14571
r? @Ms2ger
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14587)
<!-- Reviewable:end -->
-rw-r--r-- | etc/ci/check_dynamic_symbols.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/ci/check_dynamic_symbols.py b/etc/ci/check_dynamic_symbols.py index 47d31e46ee4..b6eef1831f6 100644 --- a/etc/ci/check_dynamic_symbols.py +++ b/etc/ci/check_dynamic_symbols.py @@ -15,7 +15,7 @@ import subprocess import sys symbol_regex = re.compile(b"D \*UND\*\t(.*) (.*)$") -allowed_symbols = frozenset([b'unshare', b'malloc_usable_size']) +allowed_symbols = frozenset([b'unshare', b'malloc_usable_size', b'__cxa_type_match']) actual_symbols = set() objdump_output = subprocess.check_output([ |