diff --git a/add-riscv64-support.patch b/add-riscv64-support.patch
index 8dda639edb126fd67e2c9647ca17501be2921039..250feb7bcefa4572145a6dc7b39162299239bd85 100644
--- a/add-riscv64-support.patch
+++ b/add-riscv64-support.patch
@@ -90,14 +90,14 @@ index 54cfcdd1..88eb8acd 100644
    #if  (defined IA32)
 @@ -2010,9 +2014,11 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
      static  Elf32_Half running_arch_code=EM_AARCH64;
-   #elif  (defined LOONGARCH)
+   #elif  (defined LOONGARCH64)
      static  Elf32_Half running_arch_code=EM_LOONGARCH;
 +  #elif  (defined RISCV)
 +    static  Elf32_Half running_arch_code=EM_RISCV;
    #else
      #error Method os::dll_load requires that one of following is defined:\
--         IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH
-+         IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH, RISCV
+-         IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH64
++         IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH64, RISCV
    #endif
  
    // Identify compatability class for VM's architecture and library's architecture
diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec
index b72f1a73f901c1ab169323c7a3f92a6d11fbb543..8a4f9d5d32e88086ae7a84b0574271123f807a22 100644
--- a/openjdk-1.8.0.spec
+++ b/openjdk-1.8.0.spec
@@ -943,7 +943,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}.%{buildver}
-Release: 1
+Release: 2
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
 # also included the epoch in their virtual provides. This created a
@@ -2659,6 +2659,9 @@ cjc.mainProgram(arg)
 %endif
 
 %changelog
+* Thu Aug 29 2024 Dingli Zhang <dingli@iscas.ac.cn> -1:1.8.0.422-b05.2
+- Fix build on riscv64 in prep stage for 8u422
+
 * Thu Jul 17 2024 Xiang Gao <gaoxiang@kylinos.cn> - 1:1.8.0.422-b05.1
 - Backport 8178498,8193710,8196743,8284330, serviceability tools support containers on loongarch