diff options
| author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2019-08-02 10:21:53 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-08-02 10:21:53 +0000 |
| commit | a3b16996ecb5d1cedc997204612e5f7c36ccd576 (patch) | |
| tree | bf3de0c17a38822188847b7bdaad7f70441637b0 /include/lib/utils_def.h | |
| parent | 01c44dddbda2bf74dff4bdbaee43177236982887 (diff) | |
| parent | 402b3cf8766fe2cb4ae462f7ee7761d08a1ba56c (diff) | |
Merge "Switch AARCH32/AARCH64 to __aarch64__" into integration
Diffstat (limited to 'include/lib/utils_def.h')
| -rw-r--r-- | include/lib/utils_def.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/lib/utils_def.h b/include/lib/utils_def.h index 7098bace..35ae33a6 100644 --- a/include/lib/utils_def.h +++ b/include/lib/utils_def.h @@ -21,10 +21,10 @@ #define BIT_32(nr) (U(1) << (nr)) #define BIT_64(nr) (ULL(1) << (nr)) -#ifdef AARCH32 -#define BIT BIT_32 -#else +#ifdef __aarch64__ #define BIT BIT_64 +#else +#define BIT BIT_32 #endif /* @@ -46,10 +46,10 @@ (((~UINT64_C(0)) << (l)) & (~UINT64_C(0) >> (64 - 1 - (h)))) #endif -#ifdef AARCH32 -#define GENMASK GENMASK_32 -#else +#ifdef __aarch64__ #define GENMASK GENMASK_64 +#else +#define GENMASK GENMASK_32 #endif /* @@ -109,10 +109,10 @@ ((_u32) > (UINT32_MAX - (_inc))) /* Register size of the current architecture. */ -#ifdef AARCH32 -#define REGSZ U(4) -#else +#ifdef __aarch64__ #define REGSZ U(8) +#else +#define REGSZ U(4) #endif /* |