200-musl_fix.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. --- a/coregrind/vg_preloaded.c
  2. +++ b/coregrind/vg_preloaded.c
  3. @@ -57,7 +57,7 @@
  4. void VG_NOTIFY_ON_LOAD(freeres)(Vg_FreeresToRun to_run);
  5. void VG_NOTIFY_ON_LOAD(freeres)(Vg_FreeresToRun to_run)
  6. {
  7. -# if !defined(__UCLIBC__) \
  8. +# if !defined(__UCLIBC__) && defined(__GLIBC__) \
  9. && !defined(VGPV_arm_linux_android) \
  10. && !defined(VGPV_x86_linux_android) \
  11. && !defined(VGPV_mips32_linux_android) \
  12. --- a/include/pub_tool_redir.h
  13. +++ b/include/pub_tool_redir.h
  14. @@ -243,7 +243,7 @@
  15. /* --- Soname of the standard C library. --- */
  16. #if defined(VGO_linux) || defined(VGO_solaris)
  17. -# define VG_Z_LIBC_SONAME libcZdsoZa // libc.so*
  18. +# define VG_Z_LIBC_SONAME libcZdZa // libc.*
  19. #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
  20. # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
  21. @@ -275,7 +275,11 @@
  22. /* --- Soname of the pthreads library. --- */
  23. #if defined(VGO_linux)
  24. +# if defined(__GLIBC__) || defined(__UCLIBC__)
  25. # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0
  26. +# else
  27. +# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.*
  28. +# endif
  29. #elif defined(VGO_darwin)
  30. # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib
  31. #elif defined(VGO_solaris)
  32. --- a/configure.ac
  33. +++ b/configure.ac
  34. @@ -1047,8 +1047,6 @@ case "${GLIBC_VERSION}" in
  35. ;;
  36. 2.0|2.1|*)
  37. AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
  38. - AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,])
  39. - AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc])
  40. ;;
  41. esac