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/lib/smccc.h | |
parent | f61469e532c05bfe0de06620e8762db18414a357 (diff) | |
download | trusted-firmware-a-d5dfdeb65ff5b7f24dded201d2945c7b74565ce8.tar.gz |
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/lib/smccc.h')
-rw-r--r-- | include/lib/smccc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/lib/smccc.h b/include/lib/smccc.h index 94c39d2a6d..76e60231f0 100644 --- a/include/lib/smccc.h +++ b/include/lib/smccc.h @@ -87,7 +87,7 @@ #define SMC_FROM_SECURE (U(0) << 0) #define SMC_FROM_NON_SECURE (U(1) << 0) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -155,5 +155,5 @@ static inline uint32_t smc_uuid_word(uint8_t b0, uint8_t b1, uint8_t b2, uint8_t smc_uuid_word((_uuid).node[2], (_uuid).node[3], \ (_uuid).node[4], (_uuid).node[5])) -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* SMCCC_H */ |