765e304c4b
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
73 lines
3.2 KiB
Diff
73 lines
3.2 KiB
Diff
|
|
Ported from grpc's patches
|
|
|
|
An all-in-one patch that fixes several issues:
|
|
|
|
1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
|
|
2) powerpc stacktrace implementation only works on glibc (disabled on musl)
|
|
3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
|
|
4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
|
|
|
|
--- a/mozc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
|
|
+++ b/mozc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
|
|
@@ -46,7 +46,7 @@
|
|
|
|
// The following platforms have an implementation of a hardware counter.
|
|
#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
|
|
- defined(__powerpc__) || defined(__ppc__) || \
|
|
+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
|
|
defined(_M_IX86) || defined(_M_X64)
|
|
#define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
|
|
#else
|
|
--- a/mozc/src/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
|
|
+++ b/mozc/src/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
|
|
@@ -27,6 +27,10 @@
|
|
#include <csignal>
|
|
#include <cstdio>
|
|
|
|
+#if defined(__powerpc__)
|
|
+#include <asm/ptrace.h>
|
|
+#endif
|
|
+
|
|
#include "absl/base/attributes.h"
|
|
#include "absl/base/internal/raw_logging.h"
|
|
#include "absl/base/macros.h"
|
|
@@ -55,8 +59,10 @@
|
|
return reinterpret_cast<void*>(context->uc_mcontext.pc);
|
|
#elif defined(__powerpc64__)
|
|
return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
|
|
-#elif defined(__powerpc__)
|
|
+#elif defined(__powerpc__) && defined(__GLIBC__)
|
|
return reinterpret_cast<void*>(context->uc_mcontext.regs->nip);
|
|
+#elif defined(__powerpc__)
|
|
+ return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->nip);
|
|
#elif defined(__riscv)
|
|
return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
|
|
#elif defined(__s390__) && !defined(__s390x__)
|
|
--- a/mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
|
|
+++ b/mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
|
|
@@ -64,7 +64,7 @@
|
|
#elif defined(__i386__) || defined(__x86_64__)
|
|
#define ABSL_STACKTRACE_INL_HEADER \
|
|
"absl/debugging/internal/stacktrace_x86-inl.inc"
|
|
-#elif defined(__ppc__) || defined(__PPC__)
|
|
+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
|
|
#define ABSL_STACKTRACE_INL_HEADER \
|
|
"absl/debugging/internal/stacktrace_powerpc-inl.inc"
|
|
#elif defined(__aarch64__)
|
|
--- a/mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
|
|
+++ b/mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
|
|
@@ -130,8 +130,13 @@
|
|
StacktracePowerPCGetLR(new_sp) == kernel_sigtramp_rt64_address) {
|
|
const ucontext_t* signal_context =
|
|
reinterpret_cast<const ucontext_t*>(uc);
|
|
+#if defined(__powerpc64__)
|
|
void **const sp_before_signal =
|
|
reinterpret_cast<void**>(signal_context->uc_mcontext.gp_regs[PT_R1]);
|
|
+#else
|
|
+ void **const sp_before_signal =
|
|
+ reinterpret_cast<void**>(signal_context->uc_mcontext.uc_regs->gregs[PT_R1]);
|
|
+#endif
|
|
// Check that alleged sp before signal is nonnull and is reasonably
|
|
// aligned.
|
|
if (sp_before_signal != nullptr &&
|