New upstream version 1.12.0+dfsg1

[rustc.git] / src / compiler-rt / test / asan / lit.cfg

diff --git a/src/compiler-rt/test/asan/lit.cfg b/src/compiler-rt/test/asan/lit.cfg
index 835547090a17d0a075ed09a292afc6b3bb88ee6d..894c3f859fbdb9790bbc71a6a33f34f1d8b01aeb 100644 (file)
--- a/src/compiler-rt/test/asan/lit.cfg
+++ b/src/compiler-rt/test/asan/lit.cfg
@@ -73,6 +73,8 @@ clang_asan_static_cflags = (["-fsanitize=address",
                             "-fno-omit-frame-pointer",
                             "-fno-optimize-sibling-calls"] +
                             config.debug_info_flags + target_cflags)
+if config.target_arch == 's390x':
+  clang_asan_static_cflags.append("-mbackchain")
 clang_asan_static_cxxflags = config.cxx_mode_flags + clang_asan_static_cflags
 
 if config.asan_dynamic:
@@ -138,7 +140,7 @@ sancov = os.path.join(sanitizer_common_source_dir, "scripts", "sancov.py")
 if not os.path.exists(sancov):
   lit_config.fatal("Can't find script on path %r" % sancov)
 python_exec = get_required_attr(config, "python_executable")
-config.substitutions.append( ("%sancov", python_exec + " " + sancov + " ") )
+config.substitutions.append( ("%sancov ", python_exec + " " + sancov + " ") )
 
 # Determine kernel bitness
 if config.host_arch.find('64') != -1 and config.android != "1":