diff options
| author | Michal Gorny <mgorny@gentoo.org> | 2017-08-27 20:37:06 +0000 |
|---|---|---|
| committer | Michal Gorny <mgorny@gentoo.org> | 2017-08-27 20:37:06 +0000 |
| commit | cc44d7c1f1d3e45e338faf2ecc4fb43c58dda330 (patch) | |
| tree | 521e9eb77919a11073f2599fa1870977091b2b4f /test/asan | |
| parent | 7cbce19925c4686ac96ff7e4ae38b42642dcdc3e (diff) | |
Revert r311842 - [cmake] Remove i686 target that is duplicate to i386
The required change in clang is being reverted because of the Android
build bot failure.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@311859 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/asan')
| -rw-r--r-- | test/asan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/asan/lit.cfg | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt index 19d9c88cf..8bfc15b5c 100644 --- a/test/asan/CMakeLists.txt +++ b/test/asan/CMakeLists.txt @@ -18,7 +18,7 @@ if (SHADOW_MAPPING_UNRELIABLE) endif() macro(get_bits_for_arch arch bits) - if (${arch} MATCHES "i386|arm|mips|mipsel") + if (${arch} MATCHES "i386|i686|arm|mips|mipsel") set(${bits} 32) elseif (${arch} MATCHES "x86_64|powerpc64|powerpc64le|aarch64|mips64|mips64el|s390x") set(${bits} 64) diff --git a/test/asan/lit.cfg b/test/asan/lit.cfg index c7c5036b6..e25dd297a 100644 --- a/test/asan/lit.cfg +++ b/test/asan/lit.cfg @@ -121,11 +121,16 @@ else: def build_invocation(compile_flags): return " " + " ".join([config.compile_wrapper, config.clang] + compile_flags) + " " +# Clang driver link 'x86' (i686) architecture to 'i386'. +target_arch = config.target_arch +if (target_arch == "i686"): + target_arch = "i386" + config.substitutions.append( ("%clang ", build_invocation(target_cflags)) ) config.substitutions.append( ("%clangxx ", build_invocation(target_cxxflags)) ) config.substitutions.append( ("%clang_asan ", build_invocation(clang_asan_cflags)) ) config.substitutions.append( ("%clangxx_asan ", build_invocation(clang_asan_cxxflags)) ) -config.substitutions.append( ("%shared_libasan", "libclang_rt.asan-%s.so" % config.target_arch)) +config.substitutions.append( ("%shared_libasan", "libclang_rt.asan-%s.so" % target_arch)) if config.asan_dynamic: config.substitutions.append( ("%clang_asan_static ", build_invocation(clang_asan_static_cflags)) ) config.substitutions.append( ("%clangxx_asan_static ", build_invocation(clang_asan_static_cxxflags)) ) |