From b4f8d44597faf641177134ee08db7c3fcef5aa14 Mon Sep 17 00:00:00 2001 From: Olivier Deprez Date: Thu, 19 Aug 2021 11:36:26 +0200 Subject: [PATCH] fix(el3_runtime): correct CASSERT for pauth clang build breaks when both ENABLE_PAUTH (BRANCH_PROTECTOR=1) and CRASH_REPORTING (DEBUG=1) options are enabled: include/lib/el3_runtime/cpu_data.h:135:2: error: redefinition of typedef 'assert_cpu_data_crash_stack_offset_mismatch' is a C11 feature [-Werror, -Wtypedef-redefinition] assert_cpu_data_crash_stack_offset_mismatch); ^ include/lib/el3_runtime/cpu_data.h:128:2: note: previous definition is here assert_cpu_data_crash_stack_offset_mismatch); ^ 1 error generated. Signed-off-by: Olivier Deprez Change-Id: I22c8c45a94a64620007979d55412dbb57b11b813 --- include/lib/el3_runtime/cpu_data.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/lib/el3_runtime/cpu_data.h b/include/lib/el3_runtime/cpu_data.h index 54261358e..3d57a5c59 100644 --- a/include/lib/el3_runtime/cpu_data.h +++ b/include/lib/el3_runtime/cpu_data.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2021, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -125,7 +125,7 @@ extern cpu_data_t percpu_data[PLATFORM_CORE_COUNT]; #if ENABLE_PAUTH CASSERT(CPU_DATA_APIAKEY_OFFSET == __builtin_offsetof (cpu_data_t, apiakey), - assert_cpu_data_crash_stack_offset_mismatch); + assert_cpu_data_pauth_stack_offset_mismatch); #endif #if CRASH_REPORTING