From d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 9 Jul 2019 13:49:11 -0700 Subject: Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__ NOTE: __ASSEMBLY__ macro is now deprecated in favor of __ASSEMBLER__. All common C compilers predefine a macro called __ASSEMBLER__ when preprocessing a .S file. There is no reason for TF-A to define it's own __ASSEMBLY__ macro for this purpose instead. To unify code with the export headers (which use __ASSEMBLER__ to avoid one extra dependency), let's deprecate __ASSEMBLY__ and switch the code base over to the predefined standard. Change-Id: Id7d0ec8cf330195da80499c68562b65cb5ab7417 Signed-off-by: Julius Werner --- bl32/tsp/tsp_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bl32/tsp') diff --git a/bl32/tsp/tsp_private.h b/bl32/tsp/tsp_private.h index e39f2916..cbd527f3 100644 --- a/bl32/tsp/tsp_private.h +++ b/bl32/tsp/tsp_private.h @@ -20,7 +20,7 @@ #define TSP_ARGS_END 0x40 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -148,6 +148,6 @@ tsp_args_t *tsp_system_off_main(uint64_t arg0, uint64_t arg7); uint64_t tsp_main(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* TSP_PRIVATE_H */ -- cgit v1.2.3