diff --git a/macros b/macros
index eb8dfa843c60d0641af5f2200f32b34f352b6aca..1c81dbb771099c2a181b69e21deb8283e5218b80 100644
--- a/macros
+++ b/macros
@@ -369,7 +369,7 @@ print(result)
 # way we can detect installing an unusable .o/.a file.  This is on the TODO
 # list for F34.
 %_gcc_lto_cflags	-flto=auto -ffat-lto-objects
-%_clang_lto_cflags	-flto
+%_clang_lto_cflags	%[ "%{_target_cpu}" == "riscv64" ? "" : "-flto" ]
 %_lto_cflags		%{expand:%%{_%{toolchain}_lto_cflags}}
 
 # Some linkers default to a build-id algoritim that is not supported by rpmbuild,
diff --git a/macros.fpc-srpm b/macros.fpc-srpm
index b87092b589977b1c6d120b98d68cf63c0c9dcc0b..7cc085ae528079d289db84500aa671a2257f1a62 100644
--- a/macros.fpc-srpm
+++ b/macros.fpc-srpm
@@ -1 +1 @@
-%fpc_arches x86_64 aarch64
+%fpc_arches x86_64 aarch64 riscv64
diff --git a/macros.ghc-srpm b/macros.ghc-srpm
index 319e6229c39bfe43512f1eba55be7a0410144f71..b781664aaf5621dd87b970e0d03eb54be481be50 100644
--- a/macros.ghc-srpm
+++ b/macros.ghc-srpm
@@ -1,6 +1,6 @@
 # ghc_arches is not used in current packages but still here for back compat
 # former archs: alpha ppc sparcv9 armv5tel
-%ghc_arches x86_64 aarch64
+%ghc_arches x86_64 aarch64 riscv64
 
 # deprecated - kept for ghc.spec back compatibility
 %ghc_devel_prof prof
diff --git a/macros.gnat-srpm b/macros.gnat-srpm
index bba90c103058ae25f92de97a7b74bfa4f7760012..7851e5c5746deff4d4c6aee2a54b075240d1b984 100644
--- a/macros.gnat-srpm
+++ b/macros.gnat-srpm
@@ -1,2 +1,2 @@
-%GPRbuild_arches aarch64 x86_64
+%GPRbuild_arches aarch64 x86_64 riscv64
 %GNAT_arches %{GPRbuild_arches}
diff --git a/macros.java-srpm b/macros.java-srpm
index f31d492ab3f051644f20f8f7fe6731f869112748..125efd5ec4722d92824ba70672ae9366f6eece5e 100644
--- a/macros.java-srpm
+++ b/macros.java-srpm
@@ -1,2 +1,2 @@
 # Arches that OpenJDK and dependent packages run on
-%java_arches aarch64 x86_64 loongarch64
+%java_arches aarch64 x86_64 loongarch64 riscv64
diff --git a/macros.nodejs-srpm b/macros.nodejs-srpm
index 0a2e89b0599b486b31e02030ce82213db0125212..c2129439c9688d29351e9fad1fe649514f688fe4 100644
--- a/macros.nodejs-srpm
+++ b/macros.nodejs-srpm
@@ -2,5 +2,5 @@
 # Enabling Node.js on other arches requires porting the V8 JavaScript JIT to
 # those arches.
 
-%nodejs_arches  x86_64 aarch64 loongarch64
+%nodejs_arches  x86_64 aarch64 loongarch64 riscv64
 
diff --git a/rpmrc b/rpmrc
index c504d8759473697fbf3b22aa902d07acd9e80c1e..d9dd7597d2107e21facd995413e0d9b25fbe75b2 100644
--- a/rpmrc
+++ b/rpmrc
@@ -5,3 +5,5 @@ optflags: x86_64 %{__global_compiler_flags} -m64 %{__cflags_arch_x86_64} -mtune=
 optflags: aarch64 %{__global_compiler_flags} -mbranch-protection=standard -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ]
 
 optflags: loongarch64 %{__global_compiler_flags} -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ]
+
+optflags: riscv64 %{__global_compiler_flags} -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ]
\ No newline at end of file
diff --git a/system-rpm-config.spec b/system-rpm-config.spec
index ea80375006477fe62071da260612cd4384705a47..2c52c3ce89d4c6b7469ec1cc2216059f65b2165d 100644
--- a/system-rpm-config.spec
+++ b/system-rpm-config.spec
@@ -1,4 +1,4 @@
-%define anolis_release 34
+%define anolis_release 35
 
 Summary: Anolis OS specific rpm configuration files
 Name: system-rpm-config
@@ -211,6 +211,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/anolis/srpm forge.lua
 %license MulanPSL
 
 %changelog
+* Thu Nov 9 2023 Guoguo <i@qwq.trade> - 1:23-35
+- add riscv64 for fpc, ghc, gnat, java and nodejs macros
+- add optflags for riscv64
+
 * Sun Oct  8 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 1:23-34
 - add loongarch64 for nodejs and java macros
 - add optflags for loongarch64