---
 common/utils/src/atomic/UTILS_Atomic.inc.c |    7 +++++++
 1 file changed, 7 insertions(+)

Index: otf2-3.0.3/common/utils/src/atomic/UTILS_Atomic.inc.c
===================================================================
--- otf2-3.0.3.orig/common/utils/src/atomic/UTILS_Atomic.inc.c
+++ otf2-3.0.3/common/utils/src/atomic/UTILS_Atomic.inc.c
@@ -61,6 +61,7 @@
 #define INT_TO_PTR( i ) ( i )
 #endif /* ! GCC_ATOMIC_BUILTINS_NEEDS_CASTS */
 
+#include <limits.h>
 
 static const int gcc_memorder[] = {
     __ATOMIC_RELAXED,
@@ -198,6 +199,7 @@ UTILS_Atomic_StoreN_bool( bool* ptr, boo
     __atomic_store_n( ptr, val, gcc_memorder[ memorder ] );
 }
 
+#ifndef __riscv
 STATIC_INLINE bool
 UTILS_Atomic_ExchangeN_bool( bool* ptr, bool val, UTILS_Atomic_Memorder memorder )
 {
@@ -499,6 +501,7 @@ UTILS_Atomic_FetchNand_uint16( uint16_t*
 {
     return __atomic_fetch_nand( ptr, val, gcc_memorder[ memorder ] );
 }
+#endif
 
 STATIC_INLINE uint32_t
 UTILS_Atomic_LoadN_uint32( uint32_t* ptr, UTILS_Atomic_Memorder memorder )
@@ -596,6 +599,7 @@ UTILS_Atomic_FetchNand_uint32( uint32_t*
     return __atomic_fetch_nand( ptr, val, gcc_memorder[ memorder ] );
 }
 
+#if ULONG_MAX >= UINT64_MAX
 STATIC_INLINE uint64_t
 UTILS_Atomic_LoadN_uint64( uint64_t* ptr, UTILS_Atomic_Memorder memorder )
 {
@@ -691,6 +695,7 @@ UTILS_Atomic_FetchNand_uint64( uint64_t*
 {
     return __atomic_fetch_nand( ptr, val, gcc_memorder[ memorder ] );
 }
+#endif
 
 STATIC_INLINE uintptr_t
 UTILS_Atomic_LoadN_uintptr( uintptr_t* ptr, UTILS_Atomic_Memorder memorder )
@@ -788,6 +793,7 @@ UTILS_Atomic_FetchNand_uintptr( uintptr_
     return __atomic_fetch_nand( ptr, val, gcc_memorder[ memorder ] );
 }
 
+#ifndef __riscv
 STATIC_INLINE int8_t
 UTILS_Atomic_LoadN_int8( int8_t* ptr, UTILS_Atomic_Memorder memorder )
 {
@@ -979,6 +985,7 @@ UTILS_Atomic_FetchNand_int16( int16_t* p
 {
     return __atomic_fetch_nand( ptr, val, gcc_memorder[ memorder ] );
 }
+#endif
 
 STATIC_INLINE int32_t
 UTILS_Atomic_LoadN_int32( int32_t* ptr, UTILS_Atomic_Memorder memorder )
@@ -1076,6 +1083,7 @@ UTILS_Atomic_FetchNand_int32( int32_t* p
     return __atomic_fetch_nand( ptr, val, gcc_memorder[ memorder ] );
 }
 
+#if ULONG_MAX >= UINT64_MAX
 STATIC_INLINE int64_t
 UTILS_Atomic_LoadN_int64( int64_t* ptr, UTILS_Atomic_Memorder memorder )
 {
@@ -1171,6 +1179,7 @@ UTILS_Atomic_FetchNand_int64( int64_t* p
 {
     return __atomic_fetch_nand( ptr, val, gcc_memorder[ memorder ] );
 }
+#endif
 
 STATIC_INLINE intptr_t
 UTILS_Atomic_LoadN_intptr( intptr_t* ptr, UTILS_Atomic_Memorder memorder )
