diff options
| author | Deepika Bhavnani <deepika.bhavnani@arm.com> | 2020-02-06 16:29:45 -0600 |
|---|---|---|
| committer | Deepika Bhavnani <deepika.bhavnani@arm.com> | 2020-02-11 09:22:12 -0600 |
| commit | c249d5e5cfbf2aa0f584001543c1d39953e1d6aa (patch) | |
| tree | bae825efb76949c451188bb0e96de2ea1b120514 /tftf/tests/misc_tests/test_pmu_leakage.c | |
| parent | 1b5952a79ca1a6feb7b23372420285e886497852 (diff) | |
Switch AARCH32/AARCH64 to __aarch64__
NOTE: AARCH32/AARCH64 macros are now deprecated in favor of __aarch64__.
All common C compilers pre-define the same macros to signal which
architecture the code is being compiled for: __arm__ for AArch32 (or
earlier versions) and __aarch64__ for AArch64. There's no need for TF-A
to define its own custom macros for this. In order to unify code with
the export headers (which use __aarch64__ to avoid another dependency),
let's deprecate the AARCH32 and AARCH64 macros and switch the code base
over to the pre-defined standard macro. (Since it is somewhat
unintuitive that __arm__ only means AArch32, let's standardize on only
using __aarch64__.)
NOTE: This change is based on below TFA commit
https://github.com/ARM-software/arm-trusted-firmware/commit/402b3cf8766fe2cb4ae462f7ee7761d08a1ba56c
Signed-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com>
Change-Id: If2c3dbaeb01d4a9d8cfd95d906e5eaf4ae94417f
Diffstat (limited to 'tftf/tests/misc_tests/test_pmu_leakage.c')
| -rw-r--r-- | tftf/tests/misc_tests/test_pmu_leakage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tftf/tests/misc_tests/test_pmu_leakage.c b/tftf/tests/misc_tests/test_pmu_leakage.c index da28999..36b3138 100644 --- a/tftf/tests/misc_tests/test_pmu_leakage.c +++ b/tftf/tests/misc_tests/test_pmu_leakage.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Arm Limited. All rights reserved. + * Copyright (c) 2019-2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -75,7 +75,7 @@ struct pmu_event_info { unsigned long long avg; }; -#ifdef AARCH64 +#ifdef __aarch64__ #define V8_2_DEBUG_ARCH_SUPPORTED ID_AA64DFR0_V8_2_DEBUG_ARCH_SUPPORTED #else #define V8_2_DEBUG_ARCH_SUPPORTED DBGDIDR_V8_2_DEBUG_ARCH_SUPPORTED |