From 93895c42a773ee58ba64d31d53f42a27d18725af Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sun, 30 Oct 2022 23:50:14 +0800
Subject: [PATCH] arch/arm: Typedef _[u]int32_t to __[U]INT32_TYPE__

if __INT32_TYPE__ is defined

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 arch/arm/include/inttypes.h | 99 ++++++++++++++++++++++++++++---------
 arch/arm/include/types.h    |  5 ++
 2 files changed, 80 insertions(+), 24 deletions(-)

diff --git a/arch/arm/include/inttypes.h b/arch/arm/include/inttypes.h
index 160a6c060e..88500bb22c 100644
--- a/arch/arm/include/inttypes.h
+++ b/arch/arm/include/inttypes.h
@@ -29,91 +29,142 @@
  * Pre-processor Prototypes
  ****************************************************************************/
 
+#define signed      +0
+#define unsigned    +0
+#define int         +2
+#define long        +4
+
 #define PRId8       "d"
 #define PRId16      "d"
-#define PRId32      "ld"
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define PRId32    "d"
+#else
+#  define PRId32    "ld"
+#endif
 #define PRId64      "lld"
-
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
 #define PRIi16      "i"
-#define PRIi32      "li"
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define PRIi32    "i"
+#else
+#  define PRIi32    "li"
+#endif
 #define PRIi64      "lli"
-
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
 #define PRIo16      "o"
-#define PRIo32      "lo"
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define PRIo32    "o"
+#else
+#  define PRIo32    "lo"
+#endif
 #define PRIo64      "llo"
-
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
 #define PRIu16      "u"
-#define PRIu32      "lu"
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define PRIu32    "u"
+#else
+#  define PRIu32    "lu"
+#endif
 #define PRIu64      "llu"
-
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
 #define PRIx16      "x"
-#define PRIx32      "lx"
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define PRIx32    "x"
+#else
+#  define PRIx32    "lx"
+#endif
 #define PRIx64      "llx"
-
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
 #define PRIX16      "X"
-#define PRIX32      "lX"
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define PRIX32    "X"
+#else
+#  define PRIX32    "lX"
+#endif
 #define PRIX64      "llX"
-
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
 #define SCNd16      "hd"
-#define SCNd32      "ld"
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define SCNd32    "d"
+#else
+#  define SCNd32    "ld"
+#endif
 #define SCNd64      "lld"
-
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
 #define SCNi16      "hi"
-#define SCNi32      "li"
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define SCNi32    "i"
+#else
+#  define SCNi32    "li"
+#endif
 #define SCNi64      "lli"
-
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
 #define SCNo16      "ho"
-#define SCNo32      "lo"
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define SCNo32    "o"
+#else
+#  define SCNo32    "lo"
+#endif
 #define SCNo64      "llo"
-
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
 #define SCNu16      "hu"
-#define SCNu32      "lu"
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define SCNu32    "u"
+#else
+#  define SCNu32    "lu"
+#endif
 #define SCNu64      "llu"
-
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
 #define SCNx16      "hx"
-#define SCNx32      "lx"
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define SCNx32    "x"
+#else
+#  define SCNx32    "lx"
+#endif
 #define SCNx64      "llx"
-
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
 #define INT16_C(x)  x
-#define INT32_C(x)  x ## l
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define INT32_C(x) x
+#else
+#  define INT32_C(x) x ## l
+#endif
 #define INT64_C(x)  x ## ll
 
 #define UINT8_C(x)  x
 #define UINT16_C(x) x
-#define UINT32_C(x) x ## ul
+#if defined(__INT32_TYPE__) && __INT32_TYPE__ == int
+#  define UINT32_C(x) x ## u
+#else
+#  define UINT32_C(x) x ## ul
+#endif
 #define UINT64_C(x) x ## ull
 
+#undef signed
+#undef unsigned
+#undef int
+#undef long
+
 #endif /* __ARCH_ARM_INCLUDE_INTTYPES_H */
diff --git a/arch/arm/include/types.h b/arch/arm/include/types.h
index a14c450243..400e6077c4 100644
--- a/arch/arm/include/types.h
+++ b/arch/arm/include/types.h
@@ -56,8 +56,13 @@ typedef unsigned char      _uint8_t;
 typedef signed short       _int16_t;
 typedef unsigned short     _uint16_t;
 
+#ifdef __INT32_TYPE__
+typedef __INT32_TYPE__     _int32_t;
+typedef __UINT32_TYPE__    _uint32_t;
+#else
 typedef signed long        _int32_t;
 typedef unsigned long      _uint32_t;
+#endif
 
 typedef signed long long   _int64_t;
 typedef unsigned long long _uint64_t;