fix incorrect TLS reloc macro names in x86_64 reloc.h

[musl] / arch / x86_64 / reloc.h

diff --git a/arch/x86_64/reloc.h b/arch/x86_64/reloc.h
index 2db6115..38a6073 100644 (file)
--- a/arch/x86_64/reloc.h
+++ b/arch/x86_64/reloc.h
@@ -2,9 +2,16 @@
 #include <string.h>
 #include <elf.h>
 
 #include <string.h>
 #include <elf.h>
 

+#define ETC_LDSO_PATH "/etc/ld-musl-x86_64.path"
+

 #define IS_COPY(x) ((x)==R_X86_64_COPY)
 #define IS_COPY(x) ((x)==R_X86_64_COPY)

+#define IS_PLT(x) ((x)==R_X86_64_JUMP_SLOT)

 
 

-static inline void do_single_reloc(size_t *reloc_addr, int type, size_t sym_val, size_t sym_size, unsigned char *base_addr, size_t addend)
+static inline void do_single_reloc(
+       struct dso *self, unsigned char *base_addr,
+       size_t *reloc_addr, int type, size_t addend,
+       Sym *sym, size_t sym_size,
+       struct symdef def, size_t sym_val)

 {
        switch(type) {
        case R_X86_64_GLOB_DAT:
 {
        switch(type) {
        case R_X86_64_GLOB_DAT:


@@ -24,5 +31,16 @@ static inline void do_single_reloc(size_t *reloc_addr, int type, size_t sym_val,
        case R_X86_64_COPY:
                memcpy(reloc_addr, (void *)sym_val, sym_size);
                break;
        case R_X86_64_COPY:
                memcpy(reloc_addr, (void *)sym_val, sym_size);
                break;

+       case R_X86_64_DTPMOD64:
+               *reloc_addr = def.dso ? def.dso->tls_id : self->tls_id;
+               break;
+       case R_X86_64_DTPOFF64:
+               *reloc_addr = def.sym->st_value + addend;
+               break;
+       case R_X86_64_TPOFF64:
+               *reloc_addr = (def.sym
+                       ? def.sym->st_value - def.dso->tls_offset
+                       : 0 - self->tls_offset) + addend;
+               break;

        }
 }
        }
 }