63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
This fixes build at least with gcc9 which does not define `__ppc__`.
|
|
|
|
--- a/libunwind/include/__libunwind_config.h
|
|
+++ b/libunwind/include/__libunwind_config.h
|
|
@@ -49,7 +49,7 @@
|
|
# define _LIBUNWIND_CONTEXT_SIZE 167
|
|
# define _LIBUNWIND_CURSOR_SIZE 179
|
|
# define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_PPC64
|
|
-# elif defined(__ppc__)
|
|
+# elif defined(__powerpc__)
|
|
# define _LIBUNWIND_TARGET_PPC 1
|
|
# define _LIBUNWIND_CONTEXT_SIZE 117
|
|
# define _LIBUNWIND_CURSOR_SIZE 124
|
|
--- a/libunwind/src/UnwindRegistersRestore.S
|
|
+++ b/libunwind/src/UnwindRegistersRestore.S
|
|
@@ -392,7 +392,7 @@ Lnovec:
|
|
PPC64_LR(3)
|
|
bctr
|
|
|
|
-#elif defined(__ppc__)
|
|
+#elif defined(__powerpc__)
|
|
|
|
DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind13Registers_ppc6jumptoEv)
|
|
//
|
|
--- a/libunwind/src/UnwindRegistersSave.S
|
|
+++ b/libunwind/src/UnwindRegistersSave.S
|
|
@@ -554,7 +554,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
|
|
blr
|
|
|
|
|
|
-#elif defined(__ppc__)
|
|
+#elif defined(__powerpc__)
|
|
|
|
//
|
|
// extern int unw_getcontext(unw_context_t* thread_state)
|
|
--- a/libunwind/src/config.h
|
|
+++ b/libunwind/src/config.h
|
|
@@ -95,12 +95,12 @@
|
|
#define _LIBUNWIND_BUILD_SJLJ_APIS
|
|
#endif
|
|
|
|
-#if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__)
|
|
+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__powerpc64__)
|
|
#define _LIBUNWIND_SUPPORT_FRAME_APIS
|
|
#endif
|
|
|
|
#if defined(__i386__) || defined(__x86_64__) || \
|
|
- defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) || \
|
|
+ defined(__powerpc__) || defined(__powerpc64__) || \
|
|
(!defined(__APPLE__) && defined(__arm__)) || \
|
|
(defined(__arm64__) || defined(__aarch64__)) || \
|
|
defined(__mips__)
|
|
--- a/libunwind/src/libunwind.cpp
|
|
+++ b/libunwind/src/libunwind.cpp
|
|
@@ -42,7 +42,7 @@ _LIBUNWIND_HIDDEN int __unw_init_local(unw_cursor_t *cursor,
|
|
# define REGISTER_KIND Registers_x86_64
|
|
#elif defined(__powerpc64__)
|
|
# define REGISTER_KIND Registers_ppc64
|
|
-#elif defined(__ppc__)
|
|
+#elif defined(__powerpc__)
|
|
# define REGISTER_KIND Registers_ppc
|
|
#elif defined(__aarch64__)
|
|
# define REGISTER_KIND Registers_arm64
|