diff --git a/gcc.spec b/gcc.spec index 3d11971698f7180854140f2d3b8789f5ad0d48f1..01cd59b8037e224a02b477e8d707afe1a997e08d 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 4 %global DATE 20250731 %global gitrev b3f5a0d53b84ed27cf00cfa2b9c3e2c78935c07d @@ -27,6 +27,7 @@ %else %global build_offload_nvptx 0 %global build_libquadmath 0 +%global build_offload_amdgcn 0 %endif %global build_libasan 1 %ifarch x86_64 aarch64 @@ -886,10 +887,12 @@ rm -f gcc/testsuite/go.test/test/chan/goroutines.go %build export CONFIG_SITE=NONE +export RVA23_COMPILING_FLAGS="-march=rv64imafdcbv_zicsr_zicntr_zihpm_ziccif_ziccrse_ziccamoa_zicclsm_zic64b_za64rs_zihintpause_zba_zbb_zbs_zicbom_zicbop_zicboz_zfhmin_zkt_zvfhmin_zvbb_zvkt_zihintntl_zicond_zimop_zcmop_zcb_zfa_zawrs -mabi=lp64d" +export RVA23_CONFIG_FLAGS="--with-arch=rv64imafdcbv_zicsr_zicntr_zihpm_ziccif_ziccrse_ziccamoa_zicclsm_zic64b_za64rs_zihintpause_zba_zbb_zbs_zicbom_zicbop_zicboz_zfhmin_zkt_zvfhmin_zvbb_zvkt_zihintntl_zicond_zimop_zcmop_zcb_zfa_zawrs --with-abi=lp64d" CC=gcc CXX=g++ -OPT_FLAGS="%{optflags}" +OPT_FLAGS="%{optflags} $RVA23_COMPILING_FLAGS" OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=[123]//g'` OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[123]//g'` OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/\(-Wp,\)\?-U_FORTIFY_SOURCE//g'` @@ -914,7 +917,7 @@ cd nvptx-tools-%{nvptx_tools_gitrev} rm -rf obj-%{gcc_target_platform} mkdir obj-%{gcc_target_platform} cd obj-%{gcc_target_platform} -CC="$CC" CXX="$CXX" CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \ +CC="$CC" CXX="$CXX" CFLAGS="%{optflags} $RVA23_COMPILING_FLAGS" CXXFLAGS="%{optflags} $RVA23_COMPILING_FLAGS" \ ../configure --prefix=%{_prefix} %make_build make install prefix=${IROOT}%{_prefix} @@ -942,6 +945,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ --enable-checking=release \ --with-system-zlib \ --with-gcc-major-version-only \ + ${RVA23_CONFIG_FLAGS} \ --without-isl %make_build cd .. @@ -979,6 +983,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ --with-bugurl=http://bugzilla.redhat.com/bugzilla \ --enable-checking=release --with-system-zlib \ + ${RVA23_CONFIG_FLAGS} \ --with-gcc-major-version-only --without-isl --disable-libquadmath %make_build cd .. @@ -997,8 +1002,8 @@ sed -i 's|libisl\([^-]\)|libgcc%{gcc_major}privateisl\1|g' \ ../../isl-%{isl_version}/Makefile.{am,in} ../../isl-%{isl_version}/configure \ CC=/usr/bin/gcc CXX=/usr/bin/g++ \ - CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC" --prefix=`cd ..; pwd`/isl-install -%make_build CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC" + CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC $RVA23_COMPILING_FLAGS" --prefix=`cd ..; pwd`/isl-install +%make_build CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC $RVA23_COMPILING_FLAGS" %make_install cd ../isl-install/lib rm libgcc%{gcc_major}privateisl.so{,.23} @@ -1105,6 +1110,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \ ../configure --enable-bootstrap \ --enable-languages=c,c++,fortran${enablelobjc}${enablelada}${enablelgo}${enableld},${enablelm2},lto \ + $RVA23_CONFIG_FLAGS \ $CONFIGURE_OPTS %ifarch sw_64 @@ -1123,6 +1129,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ | sed 's/ -Wformat-security / -Wformat -Wformat-security /'`" \ XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \ ../../configure --disable-bootstrap --enable-host-shared \ + ${RVA23_CONFIG_FLAGS} \ --enable-languages=jit $CONFIGURE_OPTS %make_build BOOT_CFLAGS="$OPT_FLAGS" all-gcc cp -a gcc/libgccjit.so* ../gcc/ @@ -1214,6 +1221,7 @@ CC="`$ANNOBIN_FLAGS --build-cc`" CXX="`$ANNOBIN_FLAGS --build-cxx`" \ CFLAGS="$ANNOBIN_CFLAGS1 $ANNOBIN_CFLAGS2 $ANNOBIN_LDFLAGS" \ CXXFLAGS="$ANNOBIN_CFLAGS1 `$ANNOBIN_FLAGS --build-includes` $ANNOBIN_CFLAGS2 $ANNOBIN_LDFLAGS" \ ./configure --with-gcc-plugin-dir=%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin \ + ${RVA23_CONFIG_FLAGS} \ --without-annocheck \ --without-tests \ --without-docs \ @@ -2614,6 +2622,12 @@ end %changelog +* Wed Sep 10 2025 Weisson - 14.3.0-4 +- Exclude offload amdgcn for riscv64 explicitly. + +* Wed Sep 10 2025 Weisson - 14.3.0-3 +- Add RISC-V rva23 gcc compiling options. + * Fri Aug 1 2025 Weisson - 14.3.0-2 - Add RISC-V ISA extensions.