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 /services/std_svc | |
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 'services/std_svc')
-rw-r--r-- | services/std_svc/spm/spm_private.h | 4 | ||||
-rw-r--r-- | services/std_svc/spm_mm/spm_private.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/std_svc/spm/spm_private.h b/services/std_svc/spm/spm_private.h index 740fee58..efc91cb4 100644 --- a/services/std_svc/spm/spm_private.h +++ b/services/std_svc/spm/spm_private.h @@ -32,7 +32,7 @@ /* Value returned by spm_sp_synchronous_entry() when a partition is preempted */ #define SPM_SECURE_PARTITION_PREEMPTED U(0x1234) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -114,6 +114,6 @@ int spm_response_add(uint16_t client_id, uint16_t handle, uint32_t token, int spm_response_get(uint16_t client_id, uint16_t handle, uint32_t token, u_register_t *x1, u_register_t *x2, u_register_t *x3); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SPM_PRIVATE_H */ diff --git a/services/std_svc/spm_mm/spm_private.h b/services/std_svc/spm_mm/spm_private.h index 8e94a282..ba94a4d0 100644 --- a/services/std_svc/spm_mm/spm_private.h +++ b/services/std_svc/spm_mm/spm_private.h @@ -29,7 +29,7 @@ #define SP_C_RT_CTX_SIZE 0x60 #define SP_C_RT_CTX_ENTRIES (SP_C_RT_CTX_SIZE >> DWORD_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -66,6 +66,6 @@ int spm_memory_attributes_set_smc_handler(sp_context_t *sp_ctx, u_register_t pages_count, u_register_t smc_attributes); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SPM_PRIVATE_H */ |