aboutsummaryrefslogtreecommitdiff
path: root/bl32/tsp
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2019-07-09 13:49:11 -0700
committerJulius Werner <jwerner@chromium.org>2019-08-01 13:14:12 -0700
commitd5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (patch)
treec6f6607a5bab02c7497689e043db50fad88158f8 /bl32/tsp
parentf61469e532c05bfe0de06620e8762db18414a357 (diff)
downloadtrusted-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 'bl32/tsp')
-rw-r--r--bl32/tsp/tsp_private.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/bl32/tsp/tsp_private.h b/bl32/tsp/tsp_private.h
index e39f29166c..cbd527f37e 100644
--- a/bl32/tsp/tsp_private.h
+++ b/bl32/tsp/tsp_private.h
@@ -20,7 +20,7 @@
#define TSP_ARGS_END 0x40
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <stdint.h>
@@ -148,6 +148,6 @@ tsp_args_t *tsp_system_off_main(uint64_t arg0,
uint64_t arg7);
uint64_t tsp_main(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* TSP_PRIVATE_H */