42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
--- a/libgcc/unwind-dw2-fde-dip.c
|
|
+++ b/libgcc/unwind-dw2-fde-dip.c
|
|
@@ -46,33 +46,13 @@
|
|
#include "unwind-compat.h"
|
|
#include "gthr.h"
|
|
|
|
-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
|
|
- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
|
|
- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
|
|
-# define USE_PT_GNU_EH_FRAME
|
|
-#endif
|
|
-
|
|
-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
|
|
- && defined(__BIONIC__)
|
|
-# define USE_PT_GNU_EH_FRAME
|
|
-#endif
|
|
-
|
|
-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
|
|
- && defined(__FreeBSD__) && __FreeBSD__ >= 7
|
|
-# define ElfW __ElfN
|
|
-# define USE_PT_GNU_EH_FRAME
|
|
-#endif
|
|
-
|
|
-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
|
|
- && defined(__OpenBSD__)
|
|
-# define ElfW(type) Elf_##type
|
|
-# define USE_PT_GNU_EH_FRAME
|
|
-#endif
|
|
-
|
|
-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
|
|
- && defined(TARGET_DL_ITERATE_PHDR) \
|
|
- && defined(__sun__) && defined(__svr4__)
|
|
+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR)
|
|
# define USE_PT_GNU_EH_FRAME
|
|
+# ifdef __OpenBSD__
|
|
+# define ElfW(type) Elf_##type
|
|
+# elif defined(__FreeBSD__) && __FreeBSD__ >= 7
|
|
+# define ElfW __ElfN
|
|
+# endif
|
|
#endif
|
|
|
|
#if defined(USE_PT_GNU_EH_FRAME)
|