Add x86 and arm in lsan_arch. Add liblsan-32bit for x86_64.

Change-Id: I41036b3e03d6e4d9985d747c23ffbffa5853f9fa
Signed-off-by: Maxim Ostapenko <m.ostapenko@samsung.com>

diff --git a/packaging/gcc-aarch64.spec b/packaging/gcc-aarch64.spec
index d2b206c..2abb104 100644 (file)
--- a/packaging/gcc-aarch64.spec
+++ b/packaging/gcc-aarch64.spec
@@ -27,7 +27,7 @@
 %define asan_arch x86_64 %ix86 ppc ppc64 %sparc %arm aarch64
 %define itm_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc aarch64
 %define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k
-%define lsan_arch x86_64 aarch64
+%define lsan_arch x86_64 aarch64 %arm %ix86
 %define ubsan_arch x86_64 %ix86 ppc ppc64 %arm aarch64
 %define cilkrts_arch x86_64 %ix86
 
@@ -1083,6 +1083,13 @@ chmod 644 %{buildroot}/LSAN_OPTIONS
 %{libsubdir}/32/libasan.so.*
 %endif
 
+%ifarch %lsan_arch
+%files -n liblsan-32bit
+%manifest gcc.manifest
+%defattr(-,root,root)
+%{libsubdir}/32/liblsan.so.*
+%endif
+
 %ifarch %atomic_arch
 %files -n libatomic-32bit
 %manifest gcc.manifest

diff --git a/packaging/gcc-armv7l.spec b/packaging/gcc-armv7l.spec
index 3822649..d815ac9 100644 (file)
--- a/packaging/gcc-armv7l.spec
+++ b/packaging/gcc-armv7l.spec
@@ -27,7 +27,7 @@
 %define asan_arch x86_64 %ix86 ppc ppc64 %sparc %arm aarch64
 %define itm_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc aarch64
 %define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k
-%define lsan_arch x86_64 aarch64
+%define lsan_arch x86_64 aarch64 %arm %ix86
 %define ubsan_arch x86_64 %ix86 ppc ppc64 %arm aarch64
 %define cilkrts_arch x86_64 %ix86
 
@@ -1083,6 +1083,13 @@ chmod 644 %{buildroot}/LSAN_OPTIONS
 %{libsubdir}/32/libasan.so.*
 %endif
 
+%ifarch %lsan_arch
+%files -n liblsan-32bit
+%manifest gcc.manifest
+%defattr(-,root,root)
+%{libsubdir}/32/liblsan.so.*
+%endif
+
 %ifarch %atomic_arch
 %files -n libatomic-32bit
 %manifest gcc.manifest

diff --git a/packaging/linaro-gcc.spec b/packaging/linaro-gcc.spec
index 5675485..930ddac 100644 (file)
--- a/packaging/linaro-gcc.spec
+++ b/packaging/linaro-gcc.spec
@@ -24,7 +24,7 @@
 %define asan_arch x86_64 %ix86 ppc ppc64 %sparc %arm aarch64
 %define itm_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc aarch64
 %define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k
-%define lsan_arch x86_64 aarch64
+%define lsan_arch x86_64 aarch64 %arm %ix86
 %define ubsan_arch x86_64 %ix86 ppc ppc64 %arm aarch64
 %define cilkrts_arch x86_64 %ix86
 
@@ -1080,6 +1080,13 @@ chmod 644 %{buildroot}/LSAN_OPTIONS
 %{libsubdir}/32/libasan.so.*
 %endif
 
+%ifarch %lsan_arch
+%files -n liblsan-32bit
+%manifest gcc.manifest
+%defattr(-,root,root)
+%{libsubdir}/32/liblsan.so.*
+%endif
+
 %ifarch %atomic_arch
 %files -n libatomic-32bit
 %manifest gcc.manifest