Fixed the ubsan.exp deja test error of gcc-10

This commit is contained in:
z00562913 2023-11-13 14:44:29 +08:00
parent 38e211f86f
commit ef7a7253c7

View File

@ -1,7 +1,7 @@
%global scl 1 %global scl 1
%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler} %global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
%global gcc_version 10.3.0 %global gcc_version 10.3.0
%global gcc_release 1 %global gcc_release 2
%global isl_version 0.21 %global isl_version 0.21
%global gcc_major 10 %global gcc_major 10
@ -1855,6 +1855,7 @@ end
%endif %endif
%if %{build_libatomic} %if %{build_libatomic}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic.so
%endif %endif
%if %{build_libasan} %if %{build_libasan}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libasan.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libasan.a
@ -1863,6 +1864,7 @@ end
%endif %endif
%if %{build_libubsan} %if %{build_libubsan}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libubsan.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libubsan.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libubsan.so
%endif %endif
%endif %endif
%ifarch %{multilib_64_archs} %ifarch %{multilib_64_archs}
@ -1884,6 +1886,7 @@ end
%endif %endif
%if %{build_libatomic} %if %{build_libatomic}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic.so
%endif %endif
%if %{build_libasan} %if %{build_libasan}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libasan.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libasan.a
@ -1892,6 +1895,7 @@ end
%endif %endif
%if %{build_libubsan} %if %{build_libubsan}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libubsan.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libubsan.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libubsan.so
%endif %endif
%endif %endif
%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7 %ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
@ -1905,6 +1909,7 @@ end
%endif %endif
%if %{build_libatomic} %if %{build_libatomic}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.so
%endif %endif
%if %{build_libasan} %if %{build_libasan}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan.a
@ -1913,12 +1918,19 @@ end
%endif %endif
%if %{build_libubsan} %if %{build_libubsan}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libubsan.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libubsan.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libubsan.so
%endif %endif
%else %else
%if %{build_libatomic}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.so
%endif
%if %{build_libasan} %if %{build_libasan}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan_preinit.o %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan_preinit.o
%endif %endif
%if %{build_libubsan}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libubsan.so
%endif
%endif %endif
%if %{build_libtsan} %if %{build_libtsan}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.so
@ -2593,5 +2605,14 @@ end
%doc rpm.doc/changelogs/libcc1/ChangeLog* %doc rpm.doc/changelogs/libcc1/ChangeLog*
%changelog %changelog
* Wed Dec 14 2022 Shujian Zhao <zhaoshujian@huawei.com> 10.3.0-1 * Wed Nov 15 2023 Shujian Zhao <zhaoshujian@huawei.com> 10.3.0-2
- Added multi version support for gcc-10.3.0 - Type:Fix
- ID:NA
- SUG:NA
- DESC:Fix ubsan.exp deja test issue.
* Wed Dec 14 2023 Shujian Zhao <zhaoshujian@huawei.com> 10.3.0-1
- Type:SPEC
- ID:NA
- SUG:NA
- DESC:Added multi version support for gcc-10.3.0