logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

wine-vanilla-7.20-unwind.patch (1450B)

    

  1. Fix build with llvm-libunwind, and also fix for non-llvm libunwind
  2. when using clang+bfd given clang doesn't have _Unwind_Find_FDE in
  3. its rtlib and expects it from llvm-libunwind.
  5. The _CONFIG_H_ check is for <llvm-libunwind-15 (adds _VERSION).
  6. --- a/dlls/ntdll/unix/dwarf.h
  7. +++ b/dlls/ntdll/unix/dwarf.h
  8. @@ -255,5 +255,7 @@
  9.  };
  10.  
  11. +#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__)
  12.  extern const struct dwarf_fde *_Unwind_Find_FDE (void *, struct dwarf_eh_bases *);
  13. +#endif
  14.  
  15.  static unsigned char dwarf_get_u1( const unsigned char **p )
  16. --- a/dlls/ntdll/unix/signal_x86_64.c
  17. +++ b/dlls/ntdll/unix/signal_x86_64.c
  18. @@ -623,5 +623,5 @@
  19.      int rc;
  20.  
  21. -#ifdef __APPLE__
  22. +#if defined(__APPLE__) || defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__)
  23.      rc = unw_getcontext( &unw_context );
  24.      if (rc == UNW_ESUCCESS)
  25. @@ -746,4 +746,5 @@
  26.  {
  27.      struct dwarf_eh_bases bases;
  28. +#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__)
  29.      const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context->Rip - 1), &bases );
  30.  
  31. @@ -751,4 +752,5 @@
  32.          return dwarf_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, fde,
  33.                                       &bases, &dispatch->LanguageHandler, &dispatch->HandlerData );
  34. +#endif
  35.  #ifdef HAVE_LIBUNWIND
  36.      return libunwind_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context,