Rebase riscv patch

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>

openmpi-4.0.1-riscv64.patch

@@ -1,23 +1,21 @@
 diff --git a/config/opal_config_asm.m4 b/config/opal_config_asm.m4
-index e2cfd97..d9a9073 100644
+index 65675d1..7c77d65 100644
 --- a/config/opal_config_asm.m4
 +++ b/config/opal_config_asm.m4
-@@ -1085,6 +1085,13 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
+@@ -1130,6 +1130,11 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
              fi
              OPAL_GCC_INLINE_ASSIGN='"1: li %0,0" : "=&r"(ret)'
              ;;
-+
-+	riscv64*)
++       riscv64*)
 +            opal_cv_asm_arch="RISCV64"
 +            OPAL_ASM_SUPPORT_64BIT=1
 +            OPAL_GCC_INLINE_ASSIGN='"li %0, 0" : "=&r"(ret)'
 +            ;;
-+
-         s390-*)
-             opal_cv_asm_arch="S390"
-             ;;
+         # There is no current difference between s390 and s390x
+         # But use two different defines in case some come later
+         # as s390 is 31bits while s390x is 64bits
 diff --git a/opal/include/opal/sys/architecture.h b/opal/include/opal/sys/architecture.h
-index ff4fbc9..44d48ff 100644
+index ee9aa96..8a9fc53 100644
 --- a/opal/include/opal/sys/architecture.h
 +++ b/opal/include/opal/sys/architecture.h
 @@ -44,6 +44,7 @@
@@ -26,13 +24,13 @@ index ff4fbc9..44d48ff 100644
  #define OPAL_S390X          0111
 +#define OPAL_RISCV64        0120
  #define OPAL_BUILTIN_SYNC   0200
- #define OPAL_BUILTIN_OSX    0201
  #define OPAL_BUILTIN_GCC    0202
+ #define OPAL_BUILTIN_NO     0203
 diff --git a/opal/include/opal/sys/cma.h b/opal/include/opal/sys/cma.h
-index eda529f..bea2628 100644
+index 4211013..9e02f99 100644
 --- a/opal/include/opal/sys/cma.h
 +++ b/opal/include/opal/sys/cma.h
-@@ -97,6 +97,13 @@
+@@ -92,6 +92,13 @@
  #define __NR_process_vm_readv	340
  #define __NR_process_vm_writev	341
  

openmpi.spec

@@ -44,7 +44,7 @@ Patch0:                 https://patch-diff.githubusercontent.com/raw/open-mpi/om
 Patch1:                 https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/6594.patch
 
 # Add support for riscv64
-Patch10:		openmpi-2.1.1-riscv64.patch
+Patch10:		openmpi-4.0.1-riscv64.patch
 
 BuildRequires:		gcc-c++
 BuildRequires:		gcc-gfortran