Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-05-08 18:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__

Browse source 
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>
This commit is contained in:
Julius Werner 2019-07-09 13:49:11 -07:00
parent f61469e532
commit d5dfdeb65f
90 changed files with 177 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/lib/psci/psci.h
View file

@ -166,7 +166,7 @@
#define PSCI_RESET2_TYPE_ARCH (U(0) << PSCI_RESET2_TYPE_VENDOR_SHIFT)
#define PSCI_RESET2_SYSTEM_WARM_RESET (PSCI_RESET2_TYPE_ARCH | U(0))
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include <stdint.h>
@ -348,6 +348,6 @@ int psci_features(unsigned int psci_fid);
void __dead2 psci_power_down_wfi(void);
void psci_arch_setup(void);
#endif /*__ASSEMBLY__*/
#endif /*__ASSEMBLER__*/
#endif /* PSCI_H */

4
include/lib/psci/psci_lib.h
View file

@ -9,7 +9,7 @@
#include <common/ep_info.h>
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include <cdefs.h>
#include <stdint.h>
@ -89,6 +89,6 @@ void psci_warmboot_entrypoint(void);
void psci_register_spd_pm_hook(const spd_pm_ops_t *pm);
void psci_prepare_next_non_secure_ctx(
entry_point_info_t *next_image_info);
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLER__ */
#endif /* PSCI_LIB_H */