diff --git a/gcc.spec b/gcc.spec index 85b355e..d033b1d 100644 --- a/gcc.spec +++ b/gcc.spec @@ -128,7 +128,7 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}.1%{?dist} +Release: %{gcc_release}.2%{?dist} # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -1541,6 +1541,10 @@ for crossarch in %{cross_targets}; do # Move libgomp.spec to where it belongs for %files. mv $crossarch/libgomp/libgomp.spec $CROSS_LIBPATH + # Likewise for libitm.spec + %if %{build_libitm} + mv $crossarch/libitm/libitm.spec $CROSS_LIBPATH + %endif cd .. @@ -3535,10 +3539,15 @@ end %{_prefix}/lib/gcc/aarch64-redhat-linux/%{gcc_major}/libgcc_s.so %{_prefix}/lib/gcc/aarch64-redhat-linux/%{gcc_major}/libgomp.so %{_prefix}/lib/gcc/aarch64-redhat-linux/%{gcc_major}/libgomp.spec +%if %{build_libatomic} %{_prefix}/lib/gcc/aarch64-redhat-linux/%{gcc_major}/libatomic.so %{_prefix}/lib/gcc/aarch64-redhat-linux/%{gcc_major}/libatomic.a +%endif +%if %{build_libitm} %{_prefix}/lib/gcc/aarch64-redhat-linux/%{gcc_major}/libitm.so %{_prefix}/lib/gcc/aarch64-redhat-linux/%{gcc_major}/libitm.a +%{_prefix}/lib/gcc/aarch64-redhat-linux/%{gcc_major}/libitm.spec +%endif %files -n cross-gcc-c++-aarch64 %{_prefix}/bin/aarch64-redhat-linux-c++ @@ -3553,6 +3562,9 @@ end %endif %changelog +* Mon Dec 19 2022 Marek Polacek 11.3.1-4.2 +- ship libitm.spec in cross-gcc (#2154462) + * Tue Dec 13 2022 Marek Polacek 11.3.1-4.1 - add cross compiler functionality for non-production uses (#2149650)