diff options
| author | Julius Werner <jwerner@chromium.org> | 2019-07-09 13:49:11 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2019-08-01 13:14:12 -0700 |
| commit | d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (patch) | |
| tree | c6f6607a5bab02c7497689e043db50fad88158f8 /include/common/ep_info.h | |
| parent | f61469e532c05bfe0de06620e8762db18414a357 (diff) | |
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 <jwerner@chromium.org>
Diffstat (limited to 'include/common/ep_info.h')
| -rw-r--r-- | include/common/ep_info.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/common/ep_info.h b/include/common/ep_info.h index 6cb903ef..29981509 100644 --- a/include/common/ep_info.h +++ b/include/common/ep_info.h @@ -9,10 +9,10 @@ #include <common/param_header.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> #include <lib/cassert.h> -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #include <export/common/ep_info_exp.h> @@ -30,7 +30,7 @@ #define SET_SECURITY_STATE(x, security) \ ((x) = ((x) & ~EP_SECURITY_MASK) | (security)) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* * Compile time assertions related to the 'entry_point_info' structure to @@ -56,6 +56,6 @@ CASSERT(sizeof(uintptr_t) == __builtin_offsetof(entry_point_info_t, pc), \ assert_entrypoint_and_spsr_should_be_adjacent); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* EP_INFO_H */ |