From 8662bcb7c44c34f3f279eb1565602b42fef980f3 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Tue, 4 Jul 2023 17:24:50 +0900 Subject: [PATCH] libfdt: Rename redefined macros To resolve gcc-13 build issue about redefined macros, rename redefine macros for fdt. Partly picked from raspberrypiupstream commit: https://github.com/raspberrypi/userland/commit/3d5c43768ce23095da745897372f70238d07a7fd Change-Id: I30a27da98900d52c60fd4a6207251476ae9dba98 Signed-off-by: Seung-Woo Kim --- opensrc/helpers/libfdt/libfdt_env.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/opensrc/helpers/libfdt/libfdt_env.h b/opensrc/helpers/libfdt/libfdt_env.h index 1c966b8..f80d1a8 100755 --- a/opensrc/helpers/libfdt/libfdt_env.h +++ b/opensrc/helpers/libfdt/libfdt_env.h @@ -57,16 +57,16 @@ #include #ifdef __CHECKER__ -#define __force __attribute__((force)) -#define __bitwise __attribute__((bitwise)) +#define FDT_FORCE __attribute__((force)) +#define FDT_BITWISE __attribute__((bitwise)) #else -#define __force -#define __bitwise +#define FDT_FORCE +#define FDT_BITWISE #endif -typedef uint16_t __bitwise fdt16_t; -typedef uint32_t __bitwise fdt32_t; -typedef uint64_t __bitwise fdt64_t; +typedef uint16_t FDT_BITWISE fdt16_t; +typedef uint32_t FDT_BITWISE fdt32_t; +typedef uint64_t FDT_BITWISE fdt64_t; //#define EXTRACT_BYTE(x, n) ((unsigned long long)((uint8_t *)&x)[n]) // xxx work around a compiler bug... @@ -86,29 +86,29 @@ static inline unsigned long long EXTRACT_BYTE_f(void *x, int n) static inline uint16_t fdt16_to_cpu(fdt16_t x) { - return (__force uint16_t)CPU_TO_FDT16(x); + return (FDT_FORCE uint16_t)CPU_TO_FDT16(x); } static inline fdt16_t cpu_to_fdt16(uint16_t x) { - return (__force fdt16_t)CPU_TO_FDT16(x); + return (FDT_FORCE fdt16_t)CPU_TO_FDT16(x); } static inline uint32_t fdt32_to_cpu(fdt32_t x) { - return (__force uint32_t)CPU_TO_FDT32(x); + return (FDT_FORCE uint32_t)CPU_TO_FDT32(x); } static inline fdt32_t cpu_to_fdt32(uint32_t x) { - return (__force fdt32_t)CPU_TO_FDT32(x); + return (FDT_FORCE fdt32_t)CPU_TO_FDT32(x); } static inline uint64_t fdt64_to_cpu(fdt64_t x) { - return (__force uint64_t)CPU_TO_FDT64(x); + return (FDT_FORCE uint64_t)CPU_TO_FDT64(x); } static inline fdt64_t cpu_to_fdt64(uint64_t x) { - return (__force fdt64_t)CPU_TO_FDT64(x); + return (FDT_FORCE fdt64_t)CPU_TO_FDT64(x); } #undef CPU_TO_FDT64 #undef CPU_TO_FDT32 -- 2.7.4