diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-28 15:34:23 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-01-29 15:30:09 -0800 |
| commit | e9c7fdda471d72051359f389f90adf7f7368fdad (patch) | |
| tree | c14a29a60c20218b0e5cb840822eef092bdbde2f /sources | |
| parent | 4ad37769ac7d016462d2416942594622863a9b0e (diff) | |
| download | ndk-e9c7fdda471d72051359f389f90adf7f7368fdad.tar.gz | |
Fix exception unwinding in the ARM libc++ tests.
Now that we have a separate libunwind library, we can link it in the
proper order. Doing so will fix all the unwinding failures in the
libc++ tests.
With this, most of the remaining test failures (at least for
armeabi-v7a) are mostly locale failures, which are expected because
we don't support non-en_US locales.
Bug: http://b/26194502
Change-Id: I9e37476e10fce06521b15ba45c9d99cefdc7cba2
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/cxx-stl/llvm-libc++/libcxx/test/libcxx/ndk/test/config.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/libcxx/ndk/test/config.py b/sources/cxx-stl/llvm-libc++/libcxx/test/libcxx/ndk/test/config.py index 7f587130f..56ccd9405 100644 --- a/sources/cxx-stl/llvm-libc++/libcxx/test/libcxx/ndk/test/config.py +++ b/sources/cxx-stl/llvm-libc++/libcxx/test/libcxx/ndk/test/config.py @@ -62,12 +62,13 @@ class Configuration(libcxx.test.config.Configuration): self.cxx.link_flags.append('-gcc-toolchain') self.cxx.link_flags.append(gcc_toolchain) - self.cxx.link_flags.append('-lgcc') - triple = self.get_lit_conf('target_triple') if triple.startswith('arm-'): + self.cxx.link_flags.append('-lunwind') self.cxx.link_flags.append('-latomic') + self.cxx.link_flags.append('-lgcc') + self.cxx.link_flags.append('-lc++_shared') self.cxx.link_flags.append('-lc') self.cxx.link_flags.append('-lm') |