diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2022-05-20 19:21:48 -0700 |
|---|---|---|
| committer | Sunil K Pandey <skpgkp2@gmail.com> | 2022-07-18 22:13:56 -0700 |
| commit | dbb5e618511813ab39d763db32a69ec32a1efb7b (patch) | |
| tree | 0771f9975c2f953486f87bb4007f32b99e572a2f | |
| parent | f98a799defa543ffad4dafe33f6ed86ab8215ec1 (diff) | |
| download | glibc-dbb5e618511813ab39d763db32a69ec32a1efb7b.tar.gz glibc-dbb5e618511813ab39d763db32a69ec32a1efb7b.tar.xz glibc-dbb5e618511813ab39d763db32a69ec32a1efb7b.zip | |
x86-64: Ignore r_addend for R_X86_64_GLOB_DAT/R_X86_64_JUMP_SLOT
According to x86-64 psABI, r_addend should be ignored for R_X86_64_GLOB_DAT and R_X86_64_JUMP_SLOT. Since linkers always set their r_addends to 0, we can ignore their r_addends. Reviewed-by: Fangrui Song <maskray@google.com> (cherry picked from commit f8587a61892cbafd98ce599131bf4f103466f084)
| -rw-r--r-- | sysdeps/x86_64/dl-machine.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 103eee6c3f..57016fe0fd 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -351,11 +351,13 @@ and creates an unsatisfiable circular dependency.\n", # endif /* Set to symbol size plus addend. */ value = sym->st_size; + *reloc_addr = value + reloc->r_addend; + break; # endif - /* Fall through. */ + case R_X86_64_GLOB_DAT: case R_X86_64_JUMP_SLOT: - *reloc_addr = value + reloc->r_addend; + *reloc_addr = value; break; # ifndef RESOLVE_CONFLICT_FIND_MAP |