860-use_eh_frame.patch 1.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. --- a/libgcc/unwind-dw2-fde-dip.c
  2. +++ b/libgcc/unwind-dw2-fde-dip.c
  3. @@ -46,33 +46,13 @@
  4. #include "unwind-compat.h"
  5. #include "gthr.h"
  6. -#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
  7. - && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
  8. - || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
  9. -# define USE_PT_GNU_EH_FRAME
  10. -#endif
  11. -
  12. -#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
  13. - && defined(__BIONIC__)
  14. -# define USE_PT_GNU_EH_FRAME
  15. -#endif
  16. -
  17. -#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
  18. - && defined(__FreeBSD__) && __FreeBSD__ >= 7
  19. -# define ElfW __ElfN
  20. -# define USE_PT_GNU_EH_FRAME
  21. -#endif
  22. -
  23. -#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
  24. - && defined(__OpenBSD__)
  25. -# define ElfW(type) Elf_##type
  26. -# define USE_PT_GNU_EH_FRAME
  27. -#endif
  28. -
  29. -#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
  30. - && defined(TARGET_DL_ITERATE_PHDR) \
  31. - && defined(__sun__) && defined(__svr4__)
  32. +#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR)
  33. # define USE_PT_GNU_EH_FRAME
  34. +# ifdef __OpenBSD__
  35. +# define ElfW(type) Elf_##type
  36. +# elif defined(__FreeBSD__) && __FreeBSD__ >= 7
  37. +# define ElfW __ElfN
  38. +# endif
  39. #endif
  40. #if defined(USE_PT_GNU_EH_FRAME)