diff options
| author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2019-08-02 08:57:02 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-08-02 08:57:02 +0000 |
| commit | 01c44dddbda2bf74dff4bdbaee43177236982887 (patch) | |
| tree | c6f6607a5bab02c7497689e043db50fad88158f8 /include/lib/utils.h | |
| parent | f61469e532c05bfe0de06620e8762db18414a357 (diff) | |
| parent | d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (diff) | |
Merge "Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__" into integration
Diffstat (limited to 'include/lib/utils.h')
| -rw-r--r-- | include/lib/utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/lib/utils.h b/include/lib/utils.h index 67484540..cdb125cf 100644 --- a/include/lib/utils.h +++ b/include/lib/utils.h @@ -11,7 +11,7 @@ * C code should be put in this part of the header to avoid breaking ASM files * or linker scripts including it. */ -#if !(defined(__LINKER__) || defined(__ASSEMBLY__)) +#if !(defined(__LINKER__) || defined(__ASSEMBLER__)) #include <stddef.h> #include <stdint.h> @@ -91,6 +91,6 @@ static inline u_register_t load_addr_## _name(void) \ /* Helper to invoke the function defined by DEFINE_LOAD_SYM_ADDR() */ #define LOAD_ADDR_OF(_name) (typeof(_name) *) load_addr_## _name() -#endif /* !(defined(__LINKER__) || defined(__ASSEMBLY__)) */ +#endif /* !(defined(__LINKER__) || defined(__ASSEMBLER__)) */ #endif /* UTILS_H */ |