970d6d2096
In #86751 we moved the IRELATIVE relocations to .rela.plt when --pack-dyn-relocs=android was enabled but we neglected to also move the __rela_iplt_{start,end} symbols. As a result, static binaries linked with this flag were unable to find their IRELATIVE relocations. Fix it by having the symbols surround the correct section. Reviewers: MaskRay, smithp35 Reviewed By: MaskRay Pull Request: https://github.com/llvm/llvm-project/pull/118585
75 lines
1.9 KiB
ArmAsm
75 lines
1.9 KiB
ArmAsm
# REQUIRES: aarch64
|
|
## Prior to Android V, there was a bug that caused RELR relocations to be
|
|
## applied after packed relocations. This meant that resolvers referenced by
|
|
## IRELATIVE relocations in the packed relocation section would read unrelocated
|
|
## globals when --pack-relative-relocs=android+relr is enabled. Work around this
|
|
## by placing IRELATIVE in .rela.plt.
|
|
|
|
# RUN: rm -rf %t && split-file %s %t && cd %t
|
|
# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-android a.s -o a.o
|
|
# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-android b.s -o b.o
|
|
# RUN: ld.lld -shared b.o -o b.so
|
|
# RUN: ld.lld -pie --pack-dyn-relocs=android+relr -z separate-loadable-segments a.o b.so -o a
|
|
# RUN: llvm-readobj -r a | FileCheck %s
|
|
# RUN: llvm-objdump -d a | FileCheck %s --check-prefix=ASM
|
|
|
|
# CHECK: .relr.dyn {
|
|
# CHECK-NEXT: 0x30000 R_AARCH64_RELATIVE -
|
|
# CHECK-NEXT: }
|
|
# CHECK: .rela.plt {
|
|
# CHECK-NEXT: 0x30020 R_AARCH64_JUMP_SLOT bar 0x0
|
|
# CHECK-NEXT: 0x30028 R_AARCH64_IRELATIVE - 0x10000
|
|
# CHECK-NEXT: }
|
|
|
|
# ASM: <.iplt>:
|
|
# ASM-NEXT: adrp x16, 0x30000
|
|
# ASM-NEXT: ldr x17, [x16, #0x28]
|
|
# ASM-NEXT: add x16, x16, #0x28
|
|
# ASM-NEXT: br x17
|
|
|
|
#--- a.s
|
|
.text
|
|
.type foo, %gnu_indirect_function
|
|
.globl foo
|
|
foo:
|
|
ret
|
|
|
|
.globl _start
|
|
_start:
|
|
bl foo
|
|
bl bar
|
|
|
|
.data
|
|
.balign 8
|
|
.quad .data
|
|
|
|
#--- b.s
|
|
.globl bar
|
|
bar:
|
|
ret
|
|
|
|
#--- c.s
|
|
|
|
# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-android c.s -o c.o
|
|
# RUN: ld.lld --pack-dyn-relocs=android c.o -o c
|
|
# RUN: llvm-readelf -sS c | FileCheck --check-prefix=STATIC %s
|
|
|
|
# STATIC: .rela.plt RELA 0000000000200158 000158 000018 18 AI 0 5 8
|
|
# STATIC: 0000000000200158 0 NOTYPE LOCAL HIDDEN 1 __rela_iplt_start
|
|
# STATIC: 0000000000200170 0 NOTYPE LOCAL HIDDEN 1 __rela_iplt_end
|
|
|
|
.text
|
|
.type foo, %gnu_indirect_function
|
|
.globl foo
|
|
foo:
|
|
ret
|
|
|
|
.globl _start
|
|
_start:
|
|
bl foo
|
|
|
|
.data
|
|
.balign 8
|
|
.quad __rela_iplt_start
|
|
.quad __rela_iplt_end
|