diff options
| author | Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> | 2021-01-11 18:23:36 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> | 2021-01-11 18:23:36 -0300 |
| commit | c542253f49f785339e0a8663644cb8dff28b674f (patch) | |
| tree | 805f4ebe1913d2b5fd3631888c84a4f40c71eab5 /sysdeps/aarch64/dl-machine.h | |
| parent | 44c7513a5f55101ff96e078eae896b6a289e4047 (diff) | |
| parent | 0d9793e82a19bcef10ef7d73a26cd44b7ad30753 (diff) | |
| download | glibc-c542253f49f785339e0a8663644cb8dff28b674f.tar.gz glibc-c542253f49f785339e0a8663644cb8dff28b674f.tar.xz glibc-c542253f49f785339e0a8663644cb8dff28b674f.zip | |
Merge branch release/2.32/master into ibm/2.32/master
Diffstat (limited to 'sysdeps/aarch64/dl-machine.h')
| -rw-r--r-- | sysdeps/aarch64/dl-machine.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h index 70b9ed3925..fde7cfd9e2 100644 --- a/sysdeps/aarch64/dl-machine.h +++ b/sysdeps/aarch64/dl-machine.h @@ -395,13 +395,6 @@ elf_machine_lazy_rel (struct link_map *map, /* Check for unexpected PLT reloc type. */ if (__builtin_expect (r_type == AARCH64_R(JUMP_SLOT), 1)) { - if (map->l_mach.plt == 0) - { - /* Prelinking. */ - *reloc_addr += l_addr; - return; - } - if (__glibc_unlikely (map->l_info[DT_AARCH64 (VARIANT_PCS)] != NULL)) { /* Check the symbol table for variant PCS symbols. */ @@ -425,7 +418,10 @@ elf_machine_lazy_rel (struct link_map *map, } } - *reloc_addr = map->l_mach.plt; + if (map->l_mach.plt == 0) + *reloc_addr += l_addr; + else + *reloc_addr = map->l_mach.plt; } else if (__builtin_expect (r_type == AARCH64_R(TLSDESC), 1)) { |