diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-03-13 15:33:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 15:33:13 +0000 |
| commit | 9d0ac8362a6eed5daf65e111efa6fd24e4f04098 (patch) | |
| tree | 7e36e7daeb128c94e734a645321934322deef865 /lib | |
| parent | b79239db1cabaea787a6f486c8a7c95bdf7009c3 (diff) | |
| parent | 80e1989707017a2b9c699b252a0b8bcda6e145a6 (diff) | |
Merge pull request #1880 from lmayencourt/lm/pie
PIE: fix linking with pie and binutils > 2.27
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aarch64/misc_helpers.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S index de115839..a24bf90e 100644 --- a/lib/aarch64/misc_helpers.S +++ b/lib/aarch64/misc_helpers.S @@ -531,8 +531,8 @@ func fixup_gdt_reloc #endif /* * Calculate the offset based on return address in x30. - * Assume that this funtion is called within a page of the start of - * of fixup region. + * Assume that this function is called within a page at the start of + * fixup region. */ and x2, x30, #~(PAGE_SIZE - 1) sub x0, x2, x6 /* Diff(S) = Current Address - Compiled Address */ @@ -580,13 +580,13 @@ func fixup_gdt_reloc * * r_offset is address of reference * r_info is symbol index and type of relocation (in this case - * 0x403 which corresponds to R_AARCH64_RELATIV). + * 0x403 which corresponds to R_AARCH64_RELATIVE). * r_addend is constant part of expression. * * Size of Elf64_Rela structure is 24 bytes. */ 1: - /* Assert that the relocation type is R_AARCH64_RELATIV */ + /* Assert that the relocation type is R_AARCH64_RELATIVE */ #if ENABLE_ASSERTIONS ldr x3, [x1, #8] cmp x3, #0x403 |