summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarrison Mutai <harrison.mutai@arm.com>2026-06-30 08:26:08 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2026-06-30 08:26:08 +0000
commitc1d91527b58f7865bb23ca8a55223b4e10f7db29 (patch)
treeaa2bd4ee7816ccfdea01cee103c4f7c418aff24a
parent7cb424365cb80e4d7e45e2f16bc5eab1c0351475 (diff)
parent1266b4492d33780d5cf075b5cf028fc238022da8 (diff)
downloadarm-trusted-firmware-c1d91527b58f7865bb23ca8a55223b4e10f7db29.tar.gz
arm-trusted-firmware-c1d91527b58f7865bb23ca8a55223b4e10f7db29.zip
Merge "fix(cpus): check __clang_major__ is defined" into integration
-rw-r--r--include/lib/cpus/aarch64/cpu_macros.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/lib/cpus/aarch64/cpu_macros.S b/include/lib/cpus/aarch64/cpu_macros.S
index a25e20cfb..334ab7cc4 100644
--- a/include/lib/cpus/aarch64/cpu_macros.S
+++ b/include/lib/cpus/aarch64/cpu_macros.S
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014-2025, Arm Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2026, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -547,7 +547,7 @@
.endm
-#if __clang_major__ < 17
+#if defined(__clang_major__) && __clang_major__ < 17
/*
* A problem with clang version < 17 can cause resolving nested
* 'cfi_startproc' to fail compilation.