diff --git a/IGC/common/ShaderOverride.cpp b/IGC/common/ShaderOverride.cpp
index ec4f5330c386..a59e2011cc36 100644
--- a/IGC/common/ShaderOverride.cpp
+++ b/IGC/common/ShaderOverride.cpp
@@ -50,7 +50,7 @@ static void * GetProcAddress(
 #if defined(WIN32)
 #define CDECLATTRIBUTE __cdecl
 #elif __GNUC__
-#if defined(__x86_64__) || defined(__ARM_ARCH)
+#if defined(__x86_64__) || defined(__ARM_ARCH) || defined(__riscv)
 #define CDECLATTRIBUTE
 #else
 #define CDECLATTRIBUTE                 __attribute__((__cdecl__))
diff --git a/visa/iga/IGALibrary/api/igad.h b/visa/iga/IGALibrary/api/igad.h
index 1a850210a15c..a45a7557266a 100644
--- a/visa/iga/IGALibrary/api/igad.h
+++ b/visa/iga/IGALibrary/api/igad.h
@@ -17,7 +17,7 @@ SPDX-License-Identifier: MIT
 #elif __GNUC__
 #ifdef __x86_64__
 #define CDECLATTRIBUTE
-#elif defined(__ARM_ARCH)
+#elif defined(__ARM_ARCH) || defined(__riscv)
 #define CDECLATTRIBUTE
 #else
 #define CDECLATTRIBUTE __attribute__((__cdecl__))