Fix lsan-force-options, lsan-runtime-env.

Append -marm -Wa,-mimplicit-it=arm, -ldl, -lpthread to
lsan-force-options, fix lsan-runtime-env preun script.

Change-Id: If45e9337e78b87c61c308e5eb84b44e33489f868

diff --git a/packaging/gcc-contrib.spec b/packaging/gcc-contrib.spec
index f9f329c..087da06 100644 (file)
--- a/packaging/gcc-contrib.spec
+++ b/packaging/gcc-contrib.spec
@@ -39,7 +39,7 @@
 
 %define asan_force_options -fsanitize-recover=address -fsanitize=address -fno-omit-frame-pointer -Wp,-U_FORTIFY_SOURCE -Wl,--as-needed -ldl -lpthread
 %define ubsan_force_options -fsanitize=undefined,bounds-strict,float-divide-by-zero,float-cast-overflow
-%define lsan_force_options -fsanitize=leak -fno-omit-frame-pointer -Wp,-U_FORTIFY_SOURCE
+%define lsan_force_options -fsanitize=leak -marm -Wa,-mimplicit-it=arm -fno-omit-frame-pointer -Wp,-U_FORTIFY_SOURCE -Wl,--as-needed -ldl -lpthread
 
 %define asan_runtime_options halt_on_error=false:start_deactivated=true:print_cmdline=true:quarantine_size_mb=1:detect_leaks=0:log_path=/tmp/asan.log:log_exe_name=1
 %define ubsan_runtime_options print_cmdline=true:log_path=/tmp/ubsan.log
@@ -227,7 +227,7 @@ chsmack -a "_" /etc/ld.so.preload /LSAN_OPTIONS /lsan.supp
 
 %preun -n lsan-runtime-env
 # Restore /etc/ld.so.preload
-mv -v /etc/ld.so.preload.orig /etc/ld.so.preload
+[ -f /etc/ld.so.preload.orig ] && mv -v /etc/ld.so.preload.orig /etc/ld.so.preload
 
 %package -n sanitizer-devel
 Summary:    Sanitizer platform-independent tools