You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.1 KiB
33 lines
1.1 KiB
commit f6bc52f080e4a0195c707c01f54e2eae0ff89010 |
|
Author: H.J. Lu <hjl.tools@gmail.com> |
|
Date: Fri May 20 19:21:48 2022 -0700 |
|
|
|
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) |
|
|
|
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h |
|
index 94296719d4d9fb82..742682517179fab5 100644 |
|
--- a/sysdeps/x86_64/dl-machine.h |
|
+++ b/sysdeps/x86_64/dl-machine.h |
|
@@ -347,11 +347,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
|
|
|