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/bl31 | |
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/bl31')
-rw-r--r-- | include/bl31/ehf.h | 4 | ||||
-rw-r--r-- | include/bl31/interrupt_mgmt.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/bl31/ehf.h b/include/bl31/ehf.h index ee00d09361..c13d28c357 100644 --- a/include/bl31/ehf.h +++ b/include/bl31/ehf.h @@ -7,7 +7,7 @@ #ifndef EHF_H #define EHF_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <cdefs.h> #include <stdint.h> @@ -87,6 +87,6 @@ void ehf_register_priority_handler(unsigned int pri, ehf_handler_t handler); void ehf_allow_ns_preemption(uint64_t preempt_ret_code); unsigned int ehf_is_ns_preemption_allowed(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* EHF_H */ diff --git a/include/bl31/interrupt_mgmt.h b/include/bl31/interrupt_mgmt.h index b1683cc11c..8bb1bab248 100644 --- a/include/bl31/interrupt_mgmt.h +++ b/include/bl31/interrupt_mgmt.h @@ -79,7 +79,7 @@ #define get_interrupt_src_ss(flag) (((flag) >> INTR_SRC_SS_FLAG_SHIFT) & \ INTR_SRC_SS_FLAG_MASK) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <errno.h> #include <stdint.h> @@ -143,5 +143,5 @@ interrupt_type_handler_t get_interrupt_type_handler(uint32_t type); int disable_intr_rm_local(uint32_t type, uint32_t security_state); int enable_intr_rm_local(uint32_t type, uint32_t security_state); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* INTERRUPT_MGMT_H */ |