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 --- include/lib/utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/lib/utils.h') diff --git a/include/lib/utils.h b/include/lib/utils.h index 67484540..cdb125cf 100644 --- a/include/lib/utils.h +++ b/include/lib/utils.h @@ -11,7 +11,7 @@ * C code should be put in this part of the header to avoid breaking ASM files * or linker scripts including it. */ -#if !(defined(__LINKER__) || defined(__ASSEMBLY__)) +#if !(defined(__LINKER__) || defined(__ASSEMBLER__)) #include #include @@ -91,6 +91,6 @@ static inline u_register_t load_addr_## _name(void) \ /* Helper to invoke the function defined by DEFINE_LOAD_SYM_ADDR() */ #define LOAD_ADDR_OF(_name) (typeof(_name) *) load_addr_## _name() -#endif /* !(defined(__LINKER__) || defined(__ASSEMBLY__)) */ +#endif /* !(defined(__LINKER__) || defined(__ASSEMBLER__)) */ #endif /* UTILS_H */ -- cgit v1.2.3