[unwind] fix build with GCC on PPC32
Originally reported downstream in Gentoo: https://bugs.gentoo.org/832140
```
/var/tmp/portage/sys-libs/llvm-libunwind-13.0.0/work/libunwind/src/libunwind.cpp:77:3: error: #error Architecture not supported
77 | # error Architecture not supported
| ^~~~~
[...]
/var/tmp/portage/sys-libs/llvm-libunwind-13.0.0/work/libunwind/src/libunwind.cpp: In function ‘int __unw_init_local(unw_cursor_t*, unw_context_t*)’:
/var/tmp/portage/sys-libs/llvm-libunwind-13.0.0/work/libunwind/src/libunwind.cpp:80:57: error: ‘REGISTER_KIND’ was not declared in this scope
80 | new (reinterpret_cast<UnwindCursor<LocalAddressSpace, REGISTER_KIND> *>(cursor))
| ^~~~~~~~~~~~~
[...]
```
PPC is actually a supported architecture, but GCC (tested with 11.2.0)
on powerpc32 seems to only define: `__PPC__, _ARCH_PPC, __PPC,
__powerpc` and //not// `__ppc__`.
This instead uses `__powerpc__` which should be around on PPC32
and PPC64 (but we check it after PPC64, so it's fine).
Signed-off-by: Sam James <sam@gentoo.org>
Differential Revision: https://reviews.llvm.org/D118320
NOKEYCHECK=True
GitOrigin-RevId: cd20e579df07517a4ddbf6eef58b96d04f6bd9a9
diff --git a/include/__libunwind_config.h b/include/__libunwind_config.h
index 221980a..67527d9 100644
--- a/include/__libunwind_config.h
+++ b/include/__libunwind_config.h
@@ -55,7 +55,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
diff --git a/src/UnwindRegistersRestore.S b/src/UnwindRegistersRestore.S
index 694738b..f3d9dd3 100644
--- a/src/UnwindRegistersRestore.S
+++ b/src/UnwindRegistersRestore.S
@@ -394,7 +394,7 @@
PPC64_LR(3)
bctr
-#elif defined(__ppc__)
+#elif defined(__powerpc__)
DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind13Registers_ppc6jumptoEv)
//
diff --git a/src/UnwindRegistersSave.S b/src/UnwindRegistersSave.S
index e77012e..42fd7ed 100644
--- a/src/UnwindRegistersSave.S
+++ b/src/UnwindRegistersSave.S
@@ -326,7 +326,7 @@
DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
teq $0, $0
-#elif defined(__powerpc64__)
+#elif defined(__powerpc__)
//
// extern int __unw_getcontext(unw_context_t* thread_state)
@@ -559,7 +559,7 @@
blr
-#elif defined(__ppc__)
+#elif defined(__powerpc__)
//
// extern int unw_getcontext(unw_context_t* thread_state)
diff --git a/src/assembly.h b/src/assembly.h
index b17f2ad..978f6bd 100644
--- a/src/assembly.h
+++ b/src/assembly.h
@@ -234,7 +234,7 @@
#endif
#endif /* __arm__ */
-#if defined(__ppc__) || defined(__powerpc64__)
+#if defined(__powerpc__)
#define PPC_LEFT_SHIFT(index) << (index)
#endif
diff --git a/src/config.h b/src/config.h
index f469d3c..560edda 100644
--- a/src/config.h
+++ b/src/config.h
@@ -105,7 +105,7 @@
#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__)
#define _LIBUNWIND_SUPPORT_FRAME_APIS
#endif
diff --git a/src/libunwind.cpp b/src/libunwind.cpp
index 48750ce..ef48cbe 100644
--- a/src/libunwind.cpp
+++ b/src/libunwind.cpp
@@ -51,7 +51,7 @@
# 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