Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -Nru uClibc-ng-1.0.32/ldso/ldso/or1k/dl-sysdep.h ../../build_or1k/build/uclibc-1.0.32/ldso/ldso/or1k/dl-sysdep.h
- --- uClibc-ng-1.0.32/ldso/ldso/or1k/dl-sysdep.h 2019-10-15 18:37:03.000000000 +0200
- +++ ../../build_or1k/build/uclibc-1.0.32/ldso/ldso/or1k/dl-sysdep.h 2020-03-29 16:21:56.411990657 +0200
- @@ -36,7 +36,9 @@
- #define ELF_TARGET "or1k"
- #define elf_machine_type_class(type) \
- - (((type) == R_OR1K_JMP_SLOT) * ELF_RTYPE_CLASS_PLT \
- + (((type) == R_OR1K_JMP_SLOT || (type) == R_OR1K_TLS_DTPMOD || \
- + (type) == R_OR1K_TLS_DTPOFF || \
- + (type) == R_OR1K_TLS_TPOFF) * ELF_RTYPE_CLASS_PLT \
- | ((type) == R_OR1K_COPY) * ELF_RTYPE_CLASS_COPY)
- static inline Elf32_Addr *
- diff -Nru uClibc-ng-1.0.32/ldso/ldso/or1k/elfinterp.c ../../build_or1k/build/uclibc-1.0.32/ldso/ldso/or1k/elfinterp.c
- --- uClibc-ng-1.0.32/ldso/ldso/or1k/elfinterp.c 2019-10-15 18:37:03.000000000 +0200
- +++ ../../build_or1k/build/uclibc-1.0.32/ldso/ldso/or1k/elfinterp.c 2020-03-30 08:53:34.852865904 +0200
- @@ -249,11 +249,11 @@
- *reloc_addr = tls_tpnt->l_tls_modid;
- break;
- case R_OR1K_TLS_DTPOFF:
- - *reloc_addr = symbol_addr;
- + *reloc_addr = symbol_addr + rpnt->r_addend;
- break;
- case R_OR1K_TLS_TPOFF:
- CHECK_STATIC_TLS ((struct link_map *) tls_tpnt);
- - *reloc_addr = tls_tpnt->l_tls_offset + symbol_addr + rpnt->r_addend;
- + *reloc_addr = tls_tpnt->l_tls_offset + symbol_addr + rpnt->r_addend - TLS_TCB_SIZE;
- break;
- #endif
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement