diff options
| author | Joanna Farley <joanna.farley@arm.com> | 2020-10-18 14:51:00 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-10-18 14:51:00 +0000 |
| commit | 943aff0c16434d558d3e1f5744d6119b49970504 (patch) | |
| tree | e58b88828fa7d1946361c9ef45f9f1128cf92c89 /lib/aarch64 | |
| parent | 4a6b33ec17702dfa23d8380e8e55b7f49f49dc7a (diff) | |
| parent | d7b5f40823d449cc79e6440174390997cf11a9d9 (diff) | |
| download | platform_external_arm-trusted-firmware-943aff0c16434d558d3e1f5744d6119b49970504.tar.gz platform_external_arm-trusted-firmware-943aff0c16434d558d3e1f5744d6119b49970504.tar.bz2 platform_external_arm-trusted-firmware-943aff0c16434d558d3e1f5744d6119b49970504.zip | |
Merge "Increase type widths to satisfy width requirements" into integration
Diffstat (limited to 'lib/aarch64')
| -rw-r--r-- | lib/aarch64/misc_helpers.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S index d298f2b66..052891683 100644 --- a/lib/aarch64/misc_helpers.S +++ b/lib/aarch64/misc_helpers.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -496,7 +496,7 @@ func fixup_gdt_reloc /* Test if the limits are 4K aligned */ #if ENABLE_ASSERTIONS orr x0, x0, x1 - tst x0, #(PAGE_SIZE - 1) + tst x0, #(PAGE_SIZE_MASK) ASM_ASSERT(eq) #endif /* @@ -504,7 +504,7 @@ func fixup_gdt_reloc * Assume that this function is called within a page at the start of * fixup region. */ - and x2, x30, #~(PAGE_SIZE - 1) + and x2, x30, #~(PAGE_SIZE_MASK) sub x0, x2, x6 /* Diff(S) = Current Address - Compiled Address */ adrp x1, __GOT_START__ |