From 1a56ed4b357e9023637c74c39c6885c558a737d2 Mon Sep 17 00:00:00 2001 From: Akshay Belsare Date: Thu, 8 Jun 2023 10:39:08 +0530 Subject: [PATCH] fix: integer suffix macro definition The current implementation of macro L/LL/UL/ULL concatenates the input with "L"/"LL"/"UL"/"ULL" respectively. In the case where a macro is passed to L/LL/UL/ULL as input, the input macro name is concatenated with, rather than expanding the input macro and then concatenating it. The implementation of L/LL/UL/ULL is modified to two level macro, so as to concatenate to the expansion of a macro argument. Change 5b33ad174a0 "Unify type of "cpu_idx" across PSCI module." has modified the implementation of U() to two level macros without changing the implementation of other macros. Change-Id: Ie93d67dff5ce96223a3faf6c98b98fcda530fc34 Signed-off-by: Akshay Belsare --- include/export/lib/utils_def_exp.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/export/lib/utils_def_exp.h b/include/export/lib/utils_def_exp.h index d4a4a85dd..2ee5769eb 100644 --- a/include/export/lib/utils_def_exp.h +++ b/include/export/lib/utils_def_exp.h @@ -27,10 +27,14 @@ #else # define U_(_x) (_x##U) # define U(_x) U_(_x) -# define UL(_x) (_x##UL) -# define ULL(_x) (_x##ULL) -# define L(_x) (_x##L) -# define LL(_x) (_x##LL) +# define UL_(_x) (_x##UL) +# define UL(_x) UL_(_x) +# define ULL_(_x) (_x##ULL) +# define ULL(_x) ULL_(_x) +# define L_(_x) (_x##L) +# define L(_x) L_(_x) +# define LL_(_x) (_x##LL) +# define LL(_x) LL_(_x) #endif