diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/backtrace/backtrace.c | 8 | ||||
| -rw-r--r-- | common/bl_common.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/common/backtrace/backtrace.c b/common/backtrace/backtrace.c index 53f8b071..506d4a48 100644 --- a/common/backtrace/backtrace.c +++ b/common/backtrace/backtrace.c @@ -93,7 +93,7 @@ static const char *get_el_str(unsigned int el) * Returns true if the address points to a virtual address that can be read at * the current EL, false otherwise. */ -#ifdef AARCH64 +#ifdef __aarch64__ static bool is_address_readable(uintptr_t addr) { unsigned int el = get_current_el(); @@ -123,7 +123,7 @@ static bool is_address_readable(uintptr_t addr) return true; } -#else /* if AARCH32 */ +#else /* !__aarch64__ */ static bool is_address_readable(uintptr_t addr) { unsigned int el = get_current_el(); @@ -144,7 +144,7 @@ static bool is_address_readable(uintptr_t addr) return true; } -#endif +#endif /* __aarch64__ */ /* * Returns true if all the bytes in a given object are in mapped memory and an @@ -207,7 +207,7 @@ static bool is_valid_frame_record(struct frame_record *fr) */ static struct frame_record *adjust_frame_record(struct frame_record *fr) { -#ifdef AARCH64 +#ifdef __aarch64__ return fr; #else return (struct frame_record *)((uintptr_t)fr - 4U); diff --git a/common/bl_common.c b/common/bl_common.c index 61f031bf..a09cd717 100644 --- a/common/bl_common.c +++ b/common/bl_common.c @@ -236,7 +236,7 @@ void print_entry_point_info(const entry_point_info_t *ep_info) PRINT_IMAGE_ARG(1); PRINT_IMAGE_ARG(2); PRINT_IMAGE_ARG(3); -#ifndef AARCH32 +#ifdef __aarch64__ PRINT_IMAGE_ARG(4); PRINT_IMAGE_ARG(5); PRINT_IMAGE_ARG(6); @@ -245,7 +245,7 @@ void print_entry_point_info(const entry_point_info_t *ep_info) #undef PRINT_IMAGE_ARG } -#ifdef AARCH64 +#ifdef __aarch64__ /******************************************************************************* * Handle all possible cases regarding ARMv8.3-PAuth. ******************************************************************************/ @@ -293,4 +293,4 @@ void bl_handle_pauth(void) #endif /* ENABLE_PAUTH */ } -#endif /* AARCH64 */ +#endif /* __aarch64__ */ |