diff --git a/arch/risc-v/include/inttypes.h b/arch/risc-v/include/inttypes.h
index d0940d1337..b06bc9328b 100644
--- a/arch/risc-v/include/inttypes.h
+++ b/arch/risc-v/include/inttypes.h
@@ -47,88 +47,88 @@
 #define PRId8       "d"
 #define PRId16      "d"
 #define PRId32      "d"
-#define PRId64      "lld"
+#define PRId64      "ld"
 
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
 #define PRIi16      "i"
 #define PRIi32      "i"
-#define PRIi64      "lli"
+#define PRIi64      "li"
 
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
 #define PRIo16      "o"
 #define PRIo32      "o"
-#define PRIo64      "llo"
+#define PRIo64      "lo"
 
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
 #define PRIu16      "u"
 #define PRIu32      "u"
-#define PRIu64      "llu"
+#define PRIu64      "lu"
 
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
 #define PRIx16      "x"
 #define PRIx32      "x"
-#define PRIx64      "llx"
+#define PRIx64      "lx"
 
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
 #define PRIX16      "X"
 #define PRIX32      "X"
-#define PRIX64      "llX"
+#define PRIX64      "lX"
 
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
 #define SCNd16      "hd"
 #define SCNd32      "d"
-#define SCNd64      "lld"
+#define SCNd64      "ld"
 
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
 #define SCNi16      "hi"
 #define SCNi32      "i"
-#define SCNi64      "lli"
+#define SCNi64      "li"
 
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
 #define SCNo16      "ho"
 #define SCNo32      "o"
-#define SCNo64      "llo"
+#define SCNo64      "lo"
 
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
 #define SCNu16      "hu"
 #define SCNu32      "u"
-#define SCNu64      "llu"
+#define SCNu64      "lu"
 
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
 #define SCNx16      "hx"
 #define SCNx32      "x"
-#define SCNx64      "llx"
+#define SCNx64      "lx"
 
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
 #define INT16_C(x)  x
 #define INT32_C(x)  x
-#define INT64_C(x)  x ## ll
+#define INT64_C(x)  x ## l
 
 #define UINT8_C(x)  x
 #define UINT16_C(x) x
 #define UINT32_C(x) x ## u
-#define UINT64_C(x) x ## ull
+#define UINT64_C(x) x ## ul
 
 #endif /* __ARCH_RISCV_INCLUDE_INTTYPES_H */
diff --git a/arch/risc-v/include/types.h b/arch/risc-v/include/types.h
index f4b4e55d45..61e0320079 100644
--- a/arch/risc-v/include/types.h
+++ b/arch/risc-v/include/types.h
@@ -72,8 +72,8 @@ typedef unsigned short     _uint16_t;
 typedef signed int         _int32_t;
 typedef unsigned int       _uint32_t;
 
-typedef signed long long   _int64_t;
-typedef unsigned long long _uint64_t;
+typedef signed long        _int64_t;
+typedef unsigned long      _uint64_t;
 #define __INT64_DEFINED
 
 #ifdef __LP64__