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 --- services/spd/opteed/opteed_private.h | 4 ++-- services/spd/tlkd/tlkd_private.h | 4 ++-- services/spd/tspd/tspd_private.h | 4 ++-- services/std_svc/spm/spm_private.h | 4 ++-- services/std_svc/spm_mm/spm_private.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'services') diff --git a/services/spd/opteed/opteed_private.h b/services/spd/opteed/opteed_private.h index 847b9c5c..242154f0 100644 --- a/services/spd/opteed/opteed_private.h +++ b/services/spd/opteed/opteed_private.h @@ -79,7 +79,7 @@ #define OPTEED_C_RT_CTX_SIZE 0x60 #define OPTEED_C_RT_CTX_ENTRIES (OPTEED_C_RT_CTX_SIZE >> DWORD_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -157,6 +157,6 @@ void opteed_init_optee_ep_state(struct entry_point_info *optee_entry_point, extern optee_context_t opteed_sp_context[OPTEED_CORE_COUNT]; extern uint32_t opteed_rw; extern struct optee_vectors *optee_vector_table; -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* OPTEED_PRIVATE_H */ diff --git a/services/spd/tlkd/tlkd_private.h b/services/spd/tlkd/tlkd_private.h index 53f9e20c..5d5d0e85 100644 --- a/services/spd/tlkd/tlkd_private.h +++ b/services/spd/tlkd/tlkd_private.h @@ -71,7 +71,7 @@ #define TLKD_C_RT_CTX_SIZE 0x60 #define TLKD_C_RT_CTX_ENTRIES (TLKD_C_RT_CTX_SIZE >> DWORD_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -119,6 +119,6 @@ void tlkd_init_tlk_ep_state(struct entry_point_info *tlk_entry_point, uint64_t pc, tlk_context_t *tlk_ctx); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* TLKD_PRIVATE_H */ diff --git a/services/spd/tspd/tspd_private.h b/services/spd/tspd/tspd_private.h index 50f3b875..a81eb212 100644 --- a/services/spd/tspd/tspd_private.h +++ b/services/spd/tspd/tspd_private.h @@ -126,7 +126,7 @@ #define TSPD_SP_CTX_SIZE 0x90 #define TSPD_SP_CTX_ENTRIES (TSPD_SP_CTX_SIZE >> DWORD_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include @@ -227,6 +227,6 @@ uint64_t tspd_handle_sp_preemption(void *handle); extern tsp_context_t tspd_sp_context[TSPD_CORE_COUNT]; extern tsp_vectors_t *tsp_vectors; -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* TSPD_PRIVATE_H */ 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 @@ -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 @@ -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 */ -- cgit v1.2.3