Advertisement
Guest User

Untitled

a guest
Mar 30th, 2020
126
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.44 KB | None | 0 0
  1. 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
  2. --- uClibc-ng-1.0.32/ldso/ldso/or1k/dl-sysdep.h 2019-10-15 18:37:03.000000000 +0200
  3. +++ ../../build_or1k/build/uclibc-1.0.32/ldso/ldso/or1k/dl-sysdep.h 2020-03-29 16:21:56.411990657 +0200
  4. @@ -36,7 +36,9 @@
  5.  #define ELF_TARGET "or1k"
  6.  
  7.  #define elf_machine_type_class(type) \
  8. -  (((type) == R_OR1K_JMP_SLOT) * ELF_RTYPE_CLASS_PLT \
  9. +  (((type) == R_OR1K_JMP_SLOT || (type) == R_OR1K_TLS_DTPMOD || \
  10. +   (type) == R_OR1K_TLS_DTPOFF || \
  11. +   (type) == R_OR1K_TLS_TPOFF) * ELF_RTYPE_CLASS_PLT \
  12.     | ((type) == R_OR1K_COPY) * ELF_RTYPE_CLASS_COPY)
  13.  
  14.  static inline Elf32_Addr *
  15. diff -Nru uClibc-ng-1.0.32/ldso/ldso/or1k/elfinterp.c ../../build_or1k/build/uclibc-1.0.32/ldso/ldso/or1k/elfinterp.c
  16. --- uClibc-ng-1.0.32/ldso/ldso/or1k/elfinterp.c 2019-10-15 18:37:03.000000000 +0200
  17. +++ ../../build_or1k/build/uclibc-1.0.32/ldso/ldso/or1k/elfinterp.c 2020-03-30 08:53:34.852865904 +0200
  18. @@ -249,11 +249,11 @@
  19.             *reloc_addr = tls_tpnt->l_tls_modid;
  20.             break;
  21.         case R_OR1K_TLS_DTPOFF:
  22. -           *reloc_addr = symbol_addr;
  23. +           *reloc_addr = symbol_addr + rpnt->r_addend;
  24.             break;
  25.         case R_OR1K_TLS_TPOFF:
  26.             CHECK_STATIC_TLS ((struct link_map *) tls_tpnt);
  27. -           *reloc_addr = tls_tpnt->l_tls_offset + symbol_addr + rpnt->r_addend;
  28. +           *reloc_addr = tls_tpnt->l_tls_offset + symbol_addr + rpnt->r_addend - TLS_TCB_SIZE;
  29.             break;
  30.  #endif
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement