diff --git a/debian/changelog b/debian/changelog
index b65d8306..7967cfe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-12 (1:12.0.1-7) UNRELEASED; urgency=medium
+
+  * Add a patch to fix omp build on riscv64
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 27 Aug 2021 10:43:26 +0200
+
 llvm-toolchain-12 (1:12.0.1-6) unstable; urgency=medium
 
   * Fixup build process on riscv64, the architecture building was enabled
diff --git a/debian/patches/omp-riscv64.patch b/debian/patches/omp-riscv64.patch
new file mode 100644
index 00000000..e0cba704
--- /dev/null
+++ b/debian/patches/omp-riscv64.patch
@@ -0,0 +1,23 @@
+Description: Define the affinity for riscv64
+Last-Update: 2021-08-27
+
+--- llvm-toolchain-12-12.0.1.orig/openmp/runtime/src/kmp_affinity.h
++++ llvm-toolchain-12-12.0.1/openmp/runtime/src/kmp_affinity.h
+@@ -209,6 +209,17 @@ public:
+ #elif __NR_sched_getaffinity != 123
+ #error Wrong code for getaffinity system call.
+ #endif /* __NR_sched_getaffinity */
++#elif KMP_ARCH_RISCV64
++#ifndef __NR_sched_setaffinity
++#define __NR_sched_setaffinity 122
++#elif __NR_sched_setaffinity != 122
++#error Wrong code for setaffinity system call.
++#endif /* __NR_sched_setaffinity */
++#ifndef __NR_sched_getaffinity
++#define __NR_sched_getaffinity 123
++#elif __NR_sched_getaffinity != 123
++#error Wrong code for getaffinity system call.
++#endif /* __NR_sched_getaffinity */
+ #elif KMP_ARCH_X86_64
+ #ifndef __NR_sched_setaffinity
+ #define __NR_sched_setaffinity 203
diff --git a/debian/patches/series b/debian/patches/series
index aa6a7590..daaa7a1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -146,3 +146,4 @@ scan-build-py-fix-analyze-path.diff
 scan-build-py-fix-default-bin.diff
 
 libclc-llvm-spirv.diff
+omp-riscv64.patch