Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/include Fix formats for gcc where int64 is long...
details: https://anonhg.NetBSD.org/src/rev/d30dc863afd4
branches: trunk
changeset: 833842:d30dc863afd4
user: christos <christos%NetBSD.org@localhost>
date: Sun Jul 15 00:36:13 2018 +0000
description:
Fix formats for gcc where int64 is long not long long (like clang which
should be changed).
diffstat:
sys/arch/arm/include/int_fmtio.h | 145 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 144 insertions(+), 1 deletions(-)
diffs (truncated from 325 to 300 lines):
diff -r c1a40b79dd83 -r d30dc863afd4 sys/arch/arm/include/int_fmtio.h
--- a/sys/arch/arm/include/int_fmtio.h Sun Jul 15 00:32:40 2018 +0000
+++ b/sys/arch/arm/include/int_fmtio.h Sun Jul 15 00:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.9 2014/08/13 19:48:17 matt Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.10 2018/07/15 00:36:13 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -43,31 +43,57 @@
#define PRId8 "d" /* int8_t */
#define PRId16 "d" /* int16_t */
#define PRId32 "d" /* int32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRId64 "lld" /* int64_t */
+#else
+#define PRId64 "ld" /* int64_t */
+#endif
#define PRIdLEAST8 "d" /* int_least8_t */
#define PRIdLEAST16 "d" /* int_least16_t */
#define PRIdLEAST32 "d" /* int_least32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIdLEAST64 "lld" /* int_least64_t */
+#else
+#define PRIdLEAST64 "ld" /* int_least64_t */
+#endif
#define PRIdFAST8 "d" /* int_fast8_t */
#define PRIdFAST16 "d" /* int_fast16_t */
#define PRIdFAST32 "d" /* int_fast32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIdFAST64 "lld" /* int_fast64_t */
#define PRIdMAX "lld" /* intmax_t */
+#else
+#define PRIdFAST64 "ld" /* int_fast64_t */
+#define PRIdMAX "ld" /* intmax_t */
+#endif
#define PRIdPTR "ld" /* intptr_t */
#define PRIi8 "i" /* int8_t */
#define PRIi16 "i" /* int16_t */
#define PRIi32 "i" /* int32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIi64 "lli" /* int64_t */
+#else
+#define PRIi64 "li" /* int64_t */
+#endif
#define PRIiLEAST8 "i" /* int_least8_t */
#define PRIiLEAST16 "i" /* int_least16_t */
#define PRIiLEAST32 "i" /* int_least32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIiLEAST64 "lli" /* int_least64_t */
+#else
+#define PRIiLEAST64 "li" /* int_least64_t */
+#endif
#define PRIiFAST8 "i" /* int_fast8_t */
#define PRIiFAST16 "i" /* int_fast16_t */
#define PRIiFAST32 "i" /* int_fast32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIiFAST64 "lli" /* int_fast64_t */
#define PRIiMAX "lli" /* intmax_t */
+#else
+#define PRIiFAST64 "li" /* int_fast64_t */
+#define PRIiMAX "li" /* intmax_t */
+#endif
#define PRIiPTR "li" /* intptr_t */
/* fprintf macros for unsigned integers */
@@ -75,61 +101,113 @@
#define PRIo8 "o" /* uint8_t */
#define PRIo16 "o" /* uint16_t */
#define PRIo32 "o" /* uint32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIo64 "llo" /* uint64_t */
+#else
+#define PRIo64 "lo" /* uint64_t */
+#endif
#define PRIoLEAST8 "o" /* uint_least8_t */
#define PRIoLEAST16 "o" /* uint_least16_t */
#define PRIoLEAST32 "o" /* uint_least32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIoLEAST64 "llo" /* uint_least64_t */
+#else
+#define PRIoLEAST64 "lo" /* uint_least64_t */
+#endif
#define PRIoFAST8 "o" /* uint_fast8_t */
#define PRIoFAST16 "o" /* uint_fast16_t */
#define PRIoFAST32 "o" /* uint_fast32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIoFAST64 "llo" /* uint_fast64_t */
#define PRIoMAX "llo" /* uintmax_t */
+#else
+#define PRIoFAST64 "lo" /* uint_fast64_t */
+#define PRIoMAX "lo" /* uintmax_t */
+#endif
#define PRIoPTR "lo" /* uintptr_t */
#define PRIu8 "u" /* uint8_t */
#define PRIu16 "u" /* uint16_t */
#define PRIu32 "u" /* uint32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIu64 "llu" /* uint64_t */
+#else
+#define PRIu64 "lu" /* uint64_t */
+#endif
#define PRIuLEAST8 "u" /* uint_least8_t */
#define PRIuLEAST16 "u" /* uint_least16_t */
#define PRIuLEAST32 "u" /* uint_least32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIuLEAST64 "llu" /* uint_least64_t */
+#else
+#define PRIuLEAST64 "lu" /* uint_least64_t */
+#endif
#define PRIuFAST8 "u" /* uint_fast8_t */
#define PRIuFAST16 "u" /* uint_fast16_t */
#define PRIuFAST32 "u" /* uint_fast32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIuFAST64 "llu" /* uint_fast64_t */
#define PRIuMAX "llu" /* uintmax_t */
+#else
+#define PRIuFAST64 "lu" /* uint_fast64_t */
+#define PRIuMAX "lu" /* uintmax_t */
+#endif
#define PRIuPTR "lu" /* uintptr_t */
#define PRIx8 "x" /* uint8_t */
#define PRIx16 "x" /* uint16_t */
#define PRIx32 "x" /* uint32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIx64 "llx" /* uint64_t */
+#else
+#define PRIx64 "lx" /* uint64_t */
+#endif
#define PRIxLEAST8 "x" /* uint_least8_t */
#define PRIxLEAST16 "x" /* uint_least16_t */
#define PRIxLEAST32 "x" /* uint_least32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIxLEAST64 "llx" /* uint_least64_t */
+#else
+#define PRIxLEAST64 "lx" /* uint_least64_t */
+#endif
#define PRIxFAST8 "x" /* uint_fast8_t */
#define PRIxFAST16 "x" /* uint_fast16_t */
#define PRIxFAST32 "x" /* uint_fast32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIxFAST64 "llx" /* uint_fast64_t */
#define PRIxMAX "llx" /* uintmax_t */
+#else
+#define PRIxFAST64 "lx" /* uint_fast64_t */
+#define PRIxMAX "lx" /* uintmax_t */
+#endif
#define PRIxPTR "lx" /* uintptr_t */
#define PRIX8 "X" /* uint8_t */
#define PRIX16 "X" /* uint16_t */
#define PRIX32 "X" /* uint32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIX64 "llX" /* uint64_t */
+#else
+#define PRIX64 "lX" /* uint64_t */
+#endif
#define PRIXLEAST8 "X" /* uint_least8_t */
#define PRIXLEAST16 "X" /* uint_least16_t */
#define PRIXLEAST32 "X" /* uint_least32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIXLEAST64 "llX" /* uint_least64_t */
+#else
+#define PRIXLEAST64 "lX" /* uint_least64_t */
+#endif
#define PRIXFAST8 "X" /* uint_fast8_t */
#define PRIXFAST16 "X" /* uint_fast16_t */
#define PRIXFAST32 "X" /* uint_fast32_t */
+#if defined(__clang__) || !defined(_LP64)
#define PRIXFAST64 "llX" /* uint_fast64_t */
#define PRIXMAX "llX" /* uintmax_t */
+#else
+#define PRIXFAST64 "lX" /* uint_fast64_t */
+#define PRIXMAX "lX" /* uintmax_t */
+#endif
#define PRIXPTR "lX" /* uintptr_t */
/* fscanf macros for signed integers */
@@ -137,31 +215,57 @@
#define SCNd8 "hhd" /* int8_t */
#define SCNd16 "hd" /* int16_t */
#define SCNd32 "d" /* int32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNd64 "lld" /* int64_t */
+#else
+#define SCNd64 "ld" /* int64_t */
+#endif
#define SCNdLEAST8 "hhd" /* int_least8_t */
#define SCNdLEAST16 "hd" /* int_least16_t */
#define SCNdLEAST32 "d" /* int_least32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNdLEAST64 "lld" /* int_least64_t */
+#else
+#define SCNdLEAST64 "ld" /* int_least64_t */
+#endif
#define SCNdFAST8 "d" /* int_fast8_t */
#define SCNdFAST16 "d" /* int_fast16_t */
#define SCNdFAST32 "d" /* int_fast32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNdFAST64 "lld" /* int_fast64_t */
#define SCNdMAX "lld" /* intmax_t */
+#else
+#define SCNdFAST64 "ld" /* int_fast64_t */
+#define SCNdMAX "ld" /* intmax_t */
+#endif
#define SCNdPTR "ld" /* intptr_t */
#define SCNi8 "hhi" /* int8_t */
#define SCNi16 "hi" /* int16_t */
#define SCNi32 "i" /* int32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNi64 "lli" /* int64_t */
+#else
+#define SCNi64 "li" /* int64_t */
+#endif
#define SCNiLEAST8 "hhi" /* int_least8_t */
#define SCNiLEAST16 "hi" /* int_least16_t */
#define SCNiLEAST32 "i" /* int_least32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNiLEAST64 "lli" /* int_least64_t */
+#else
+#define SCNiLEAST64 "li" /* int_least64_t */
+#endif
#define SCNiFAST8 "i" /* int_fast8_t */
#define SCNiFAST16 "i" /* int_fast16_t */
#define SCNiFAST32 "i" /* int_fast32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNiFAST64 "lli" /* int_fast64_t */
#define SCNiMAX "lli" /* intmax_t */
+#else
+#define SCNiFAST64 "li" /* int_fast64_t */
+#define SCNiMAX "li" /* intmax_t */
+#endif
#define SCNiPTR "li" /* intptr_t */
/* fscanf macros for unsigned integers */
@@ -169,46 +273,85 @@
#define SCNo8 "hho" /* uint8_t */
#define SCNo16 "ho" /* uint16_t */
#define SCNo32 "o" /* uint32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNo64 "llo" /* uint64_t */
+#else
+#define SCNo64 "lo" /* uint64_t */
+#endif
#define SCNoLEAST8 "hho" /* uint_least8_t */
#define SCNoLEAST16 "ho" /* uint_least16_t */
#define SCNoLEAST32 "o" /* uint_least32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNoLEAST64 "llo" /* uint_least64_t */
+#else
+#define SCNoLEAST64 "lo" /* uint_least64_t */
+#endif
#define SCNoFAST8 "o" /* uint_fast8_t */
#define SCNoFAST16 "o" /* uint_fast16_t */
#define SCNoFAST32 "o" /* uint_fast32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNoFAST64 "llo" /* uint_fast64_t */
#define SCNoMAX "llo" /* uintmax_t */
+#else
+#define SCNoFAST64 "lo" /* uint_fast64_t */
+#define SCNoMAX "lo" /* uintmax_t */
+#endif
#define SCNoPTR "lo" /* uintptr_t */
#define SCNu8 "hhu" /* uint8_t */
#define SCNu16 "hu" /* uint16_t */
#define SCNu32 "u" /* uint32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNu64 "llu" /* uint64_t */
+#else
+#define SCNu64 "lu" /* uint64_t */
+#endif
#define SCNuLEAST8 "hhu" /* uint_least8_t */
#define SCNuLEAST16 "hu" /* uint_least16_t */
#define SCNuLEAST32 "u" /* uint_least32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNuLEAST64 "llu" /* uint_least64_t */
+#else
+#define SCNuLEAST64 "lu" /* uint_least64_t */
+#endif
#define SCNuFAST8 "u" /* uint_fast8_t */
#define SCNuFAST16 "u" /* uint_fast16_t */
#define SCNuFAST32 "u" /* uint_fast32_t */
+#if defined(__clang__) || !defined(_LP64)
#define SCNuFAST64 "llu" /* uint_fast64_t */
#define SCNuMAX "llu" /* uintmax_t */
+#else
+#define SCNuFAST64 "lu" /* uint_fast64_t */
+#define SCNuMAX "lu" /* uintmax_t */
+#endif
#define SCNuPTR "lu" /* uintptr_t */
#define SCNx8 "hhx" /* uint8_t */
#define SCNx16 "hx" /* uint16_t */
#define SCNx32 "x" /* uint32_t */
+#if defined(__clang__) || !defined(_LP64)
Home |
Main Index |
Thread Index |
Old Index