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 --- include/lib/libc/aarch64/setjmp_.h | 4 ++-- include/lib/libc/setjmp.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include/lib/libc') diff --git a/include/lib/libc/aarch64/setjmp_.h b/include/lib/libc/aarch64/setjmp_.h index 174b3eb1..f880a17b 100644 --- a/include/lib/libc/aarch64/setjmp_.h +++ b/include/lib/libc/aarch64/setjmp_.h @@ -18,13 +18,13 @@ #define JMP_SIZE (JMP_CTX_END >> 3) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include /* Jump buffer hosting x18 - x30 and sp_el0 registers */ typedef uint64_t jmp_buf[JMP_SIZE] __aligned(16); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SETJMP__H */ diff --git a/include/lib/libc/setjmp.h b/include/lib/libc/setjmp.h index 5661201a..be8e2c01 100644 --- a/include/lib/libc/setjmp.h +++ b/include/lib/libc/setjmp.h @@ -9,12 +9,12 @@ #include -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include int setjmp(jmp_buf env); __dead2 void longjmp(jmp_buf env, int val); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SETJMP_H */ -- cgit v1.2.3