diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2017-09-16 05:13:56 +0000 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2017-09-16 05:13:56 +0000 |
| commit | 2e99c092c389eed3bdf31282f8f06f4265d8eab0 (patch) | |
| tree | 21a8e3f6b296fa310d5bc9784a64ca8a87bb27a8 /test/asan/lit.cfg | |
| parent | 3c6b804641aa83d6a5307ca3ea6a73e75fc4ecce (diff) | |
[sanitizer] Move android_commoands from asan into sanitizer_common
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@313443 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/asan/lit.cfg')
| -rw-r--r-- | test/asan/lit.cfg | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/test/asan/lit.cfg b/test/asan/lit.cfg index 1edefe9d7..213693e6f 100644 --- a/test/asan/lit.cfg +++ b/test/asan/lit.cfg @@ -71,11 +71,6 @@ if config.compiler_id == 'GNU': else: extra_link_flags = [] -# BFD linker in 64-bit android toolchains fails to find libm.so, which is a -# transitive shared library dependency (via asan runtime). -if config.android: - extra_link_flags += ["-lm"] - # Setup default compiler flags used with -fsanitize=address option. # FIXME: Review the set of required flags and check if it can be reduced. target_cflags = [get_required_attr(config, "target_cflags")] + extra_link_flags @@ -110,12 +105,6 @@ if platform.system() == 'Windows': win_runtime_feature = "win32-static-asan" config.available_features.add(win_runtime_feature) -asan_lit_source_dir = get_required_attr(config, "asan_lit_source_dir") -if config.android == "1": - config.available_features.add('android') - compile_wrapper = os.path.join(asan_lit_source_dir, "android_commands", "android_compile.py") + " " - config.compile_wrapper = compile_wrapper - def build_invocation(compile_flags): return " " + " ".join([config.compile_wrapper, config.clang] + compile_flags) + " " @@ -178,7 +167,7 @@ python_exec = get_required_attr(config, "python_executable") config.substitutions.append( ("%sancov ", python_exec + " " + sancov + " ") ) # Determine kernel bitness -if config.host_arch.find('64') != -1 and config.android != "1": +if config.host_arch.find('64') != -1 and not config.android: kernel_bits = '64' else: kernel_bits = '32' |