diff --git a/gcc.spec b/gcc.spec index f9cf84a..6813bb4 100644 --- a/gcc.spec +++ b/gcc.spec @@ -813,7 +813,6 @@ Summary: Cross targeted AArch64 gcc for developer use. Not intended for product Provides: cross-gcc-aarch64 = %{version}-%{release} %if %{build_cross} Requires: cross-binutils-aarch64 >= 2.35 -Requires: sysroot-aarch64-el9-glibc >= 2.34 BuildRequires: sysroot-aarch64-el9-glibc >= 2.34 BuildRequires: cross-binutils-aarch64 >= 2.35 %endif @@ -899,10 +898,7 @@ rm -f gcc/testsuite/go.test/test/fixedbugs/issue19182.go %endif echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE.native - -for crossarch in %{cross_targets}; do - echo "Red Hat %{version}-%{gcc_release} cross from $crossarch" > gcc/DEV-PHASE.$crossarch -done +echo 'Red Hat %{version}-%{gcc_release} cross from %{arch}' > gcc/DEV-PHASE.cross cp -p gcc/DEV-PHASE{.native,} cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h @@ -1275,7 +1271,7 @@ for crossarch in %{cross_targets}; do esac # Temporarily replace DEV-PHASE. - cp -p ../../gcc/DEV-PHASE{.$crossarch,} + cp -p ../../gcc/DEV-PHASE{.cross,} CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ CXXFLAGS="`echo " $OPT_FLAGS " | sed 's/ -Wall / /g;s/ -fexceptions / /g' \ @@ -1283,6 +1279,7 @@ for crossarch in %{cross_targets}; do XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \ ../../configure $CONFIGURE_OPTS_BASE $CONFIGURE_OPTS_CROSS \ --with-sysroot=/usr/$crossarch/sys-root/el9/ \ + --with-gxx-include-dir="/usr/$crossarch/sys-root/el9/%{_prefix}/include/c++/%{gcc_major}" \ --target=$crossarch \ $CONFIGURE_OPTS_FOR_ARCH make %{?_smp_mflags} @@ -1502,7 +1499,7 @@ for crossarch in %{cross_targets}; do CROSS_LIBPATH=%{buildroot}%{_prefix}/lib/gcc/$crossarch/%{gcc_major}/ # Temporarily replace DEV-PHASE. - cp -p ../../gcc/DEV-PHASE{.$crossarch,} + cp -p ../../gcc/DEV-PHASE{.cross,} # Use -j1, because build-many-glibcs says: # Parallel "make install" for GCC has race conditions that can @@ -1526,6 +1523,11 @@ for crossarch in %{cross_targets}; do cd .. + pushd $CROSS_LIBPATH + mv include-fixed/syslimits.h include/syslimits.h + mv include-fixed/limits.h include/limits.h + popd + echo '/* GNU ld script Use the shared library, but some functions are only in the static library. */