mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-02 13:59:59 +00:00
Code Issues Projects Releases Wiki Activity

breakpad: Update to latest upstream

Browse Source 
Drop upstreamed patch
Adjust syscalls for mips64
Drop fpregset_t/mcontext alternatives for musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2019-12-15 02:12:40 -08:00
parent 0e5d85318d
commit 28cbc85732
5 changed files with 50 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch → meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch
+21 -36
View File
@@ -1,26 +1,26 @@
From d1d7b616219fd47736c804ff4c2f393d7184a75b Mon Sep 17 00:00:00 2001 From 5c63eb5d56abd4e5232add4727247965a863d851 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 23 Dec 2018 16:58:04 -0800 Date: Sun, 15 Dec 2019 14:02:45 -0800
Subject: [PATCH] chromium: stack pointer clobber Subject: [PATCH] Do not add stack pointer to clobber list
Do not add stack pointer to clobber list It was being ignored until now when gcc 9.0 became capable
of flagging these silent ignore via [1].
it was being ignored until gcc 9.0 became capable We weren't actually clobbering the stack pointers here
of flagging this silent ignoring via [1] so it should not cause change in behavior.
[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813<Paste> [1] https://gcc.gnu.org/PR52813
Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160]
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- ---
src/third_party/lss/linux_syscall_support.h | 10 +++++----- linux_syscall_support.h | 8 ++++----
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
Index: b/src/third_party/lss/linux_syscall_support.h diff --git a/linux_syscall_support.h b/linux_syscall_support.h
=================================================================== index 9276f56..6e73309 100644
--- a/src/third_party/lss/linux_syscall_support.h --- a/linux_syscall_support.h
+++ b/src/third_party/lss/linux_syscall_support.h +++ b/linux_syscall_support.h
@@ -1957,7 +1957,7 @@ struct kernel_statfs { @@ -1955,7 +1955,7 @@ struct kernel_statfs {
LSS_ENTRYPOINT \ LSS_ENTRYPOINT \
"pop %%ebx" \ "pop %%ebx" \
args \ args \
@@ -29,16 +29,7 @@ Index: b/src/third_party/lss/linux_syscall_support.h
LSS_RETURN(type,__res) LSS_RETURN(type,__res)
#undef _syscall0 #undef _syscall0
#define _syscall0(type,name) \ #define _syscall0(type,name) \
@@ -1966,7 +1966,7 @@ struct kernel_statfs { @@ -2012,7 +2012,7 @@ struct kernel_statfs {
__asm__ volatile(LSS_ENTRYPOINT \
: "=a" (__res) \
: "0" (__NR_##name) \
- : "esp", "memory"); \
+ : "memory"); \
LSS_RETURN(type,__res); \
}
#undef _syscall1
@@ -2014,7 +2014,7 @@ struct kernel_statfs {
: "i" (__NR_##name), "ri" ((long)(arg1)), \ : "i" (__NR_##name), "ri" ((long)(arg1)), \
"c" ((long)(arg2)), "d" ((long)(arg3)), \ "c" ((long)(arg2)), "d" ((long)(arg3)), \
"S" ((long)(arg4)), "D" ((long)(arg5)) \ "S" ((long)(arg4)), "D" ((long)(arg5)) \
@@ -47,7 +38,7 @@ Index: b/src/third_party/lss/linux_syscall_support.h
LSS_RETURN(type,__res); \ LSS_RETURN(type,__res); \
} }
#undef _syscall6 #undef _syscall6
@@ -2036,7 +2036,7 @@ struct kernel_statfs { @@ -2034,7 +2034,7 @@ struct kernel_statfs {
: "i" (__NR_##name), "0" ((long)(&__s)), \ : "i" (__NR_##name), "0" ((long)(&__s)), \
"c" ((long)(arg2)), "d" ((long)(arg3)), \ "c" ((long)(arg2)), "d" ((long)(arg3)), \
"S" ((long)(arg4)), "D" ((long)(arg5)) \ "S" ((long)(arg4)), "D" ((long)(arg5)) \
@@ -56,7 +47,7 @@ Index: b/src/third_party/lss/linux_syscall_support.h
LSS_RETURN(type,__res); \ LSS_RETURN(type,__res); \
} }
LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
@@ -2122,7 +2122,7 @@ struct kernel_statfs { @@ -2120,7 +2120,7 @@ struct kernel_statfs {
: "0"(-EINVAL), "i"(__NR_clone), : "0"(-EINVAL), "i"(__NR_clone),
"m"(fn), "m"(child_stack), "m"(flags), "m"(arg), "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
"m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
@@ -65,12 +56,6 @@ Index: b/src/third_party/lss/linux_syscall_support.h
LSS_RETURN(int, __res); LSS_RETURN(int, __res);
} }
@@ -2407,7 +2407,7 @@ struct kernel_statfs { --
"d"(LSS_SYSCALL_ARG(parent_tidptr)), 2.24.1
"r"(LSS_SYSCALL_ARG(newtls)),
"r"(LSS_SYSCALL_ARG(child_tidptr))
- : "rsp", "memory", "r8", "r10", "r11", "rcx");
+ : "memory", "r8", "r10", "r11", "rcx");
}
LSS_RETURN(int, __res);
}
meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch
+4 -6
View File
@@ -8,11 +8,9 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
src/client/linux/handler/exception_handler.cc | 17 +++++++++++++++++ src/client/linux/handler/exception_handler.cc | 17 +++++++++++++++++
1 file changed, 17 insertions(+) 1 file changed, 17 insertions(+)
Index: git/src/client/linux/handler/exception_handler.cc --- a/src/client/linux/handler/exception_handler.cc
=================================================================== +++ b/src/client/linux/handler/exception_handler.cc
--- git.orig/src/client/linux/handler/exception_handler.cc @@ -490,7 +490,19 @@ bool ExceptionHandler::SimulateSignalDel
+++ git/src/client/linux/handler/exception_handler.cc
@@ -495,7 +495,19 @@ bool ExceptionHandler::SimulateSignalDel
siginfo.si_code = SI_USER; siginfo.si_code = SI_USER;
siginfo.si_pid = getpid(); siginfo.si_pid = getpid();
ucontext_t context; ucontext_t context;
@@ -32,7 +30,7 @@ Index: git/src/client/linux/handler/exception_handler.cc
return HandleSignal(sig, &siginfo, &context); return HandleSignal(sig, &siginfo, &context);
} }
@@ -680,9 +692,14 @@ bool ExceptionHandler::WriteMinidump() { @@ -675,9 +687,14 @@ bool ExceptionHandler::WriteMinidump() {
sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0); sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
CrashContext context; CrashContext context;
meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch
+18 -7
View File
@@ -8,11 +8,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
linux_syscall_support.h | 3 +++ linux_syscall_support.h | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
Index: lss/linux_syscall_support.h --- a/linux_syscall_support.h
=================================================================== +++ b/linux_syscall_support.h
--- lss.orig/linux_syscall_support.h @@ -816,6 +816,9 @@ struct kernel_statfs {
+++ lss/linux_syscall_support.h
@@ -793,6 +793,9 @@ struct kernel_statfs {
#define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG) #define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG)
#endif #endif
@@ -22,7 +20,7 @@ Index: lss/linux_syscall_support.h
#if defined(__x86_64__) #if defined(__x86_64__)
#ifndef ARCH_SET_GS #ifndef ARCH_SET_GS
@@ -924,6 +927,7 @@ struct kernel_statfs { @@ -947,6 +950,7 @@ struct kernel_statfs {
#ifndef __NR_fallocate #ifndef __NR_fallocate
#define __NR_fallocate 324 #define __NR_fallocate 324
#endif #endif
@@ -30,7 +28,7 @@ Index: lss/linux_syscall_support.h
/* End of i386 definitions */ /* End of i386 definitions */
#elif defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) #elif defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
#ifndef __NR_setresuid #ifndef __NR_setresuid
@@ -1211,6 +1215,12 @@ struct kernel_statfs { @@ -1239,6 +1243,12 @@ struct kernel_statfs {
#ifndef __NR_fallocate #ifndef __NR_fallocate
#define __NR_fallocate 285 #define __NR_fallocate 285
#endif #endif
@@ -43,3 +41,16 @@ Index: lss/linux_syscall_support.h
/* End of x86-64 definitions */ /* End of x86-64 definitions */
#elif defined(__mips__) #elif defined(__mips__)
#if _MIPS_SIM == _MIPS_SIM_ABI32 #if _MIPS_SIM == _MIPS_SIM_ABI32
@@ -1418,6 +1428,12 @@ struct kernel_statfs {
#ifndef __NR_ioprio_get
#define __NR_ioprio_get (__NR_Linux + 274)
#endif
+
+#undef __NR_pread
+#define __NR_pread __NR_pread64
+#undef __NR_pwrite
+#define __NR_pwrite __NR_pwrite64
+
/* End of MIPS (64bit API) definitions */
#else
#ifndef __NR_setresuid
meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch
-59
View File
@@ -3,48 +3,6 @@ map the mcontext_t structure for musl
Upstream-Status: Inappropriate[need to consider Android] Upstream-Status: Inappropriate[need to consider Android]
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: git/src/client/linux/dump_writer_common/thread_info.cc
===================================================================
--- git.orig/src/client/linux/dump_writer_common/thread_info.cc
+++ git/src/client/linux/dump_writer_common/thread_info.cc
@@ -229,7 +229,6 @@ void ThreadInfo::FillCPUContext(RawConte
}
#elif defined(__mips__)
-
uintptr_t ThreadInfo::GetInstructionPointer() const {
return mcontext.pc;
}
@@ -263,8 +262,11 @@ void ThreadInfo::FillCPUContext(RawConte
out->cause = 0; // Not stored in mcontext
for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i)
+#ifdef __GLIBC__
out->float_save.regs[i] = mcontext.fpregs.fp_r.fp_fregs[i]._fp_fregs;
-
+#else
+ out->float_save.regs[i] = mcontext.fpregs[i];
+#endif
out->float_save.fpcsr = mcontext.fpc_csr;
#if _MIPS_SIM == _ABIO32
out->float_save.fir = mcontext.fpc_eir;
Index: git/src/client/linux/dump_writer_common/ucontext_reader.cc
===================================================================
--- git.orig/src/client/linux/dump_writer_common/ucontext_reader.cc
+++ git/src/client/linux/dump_writer_common/ucontext_reader.cc
@@ -247,8 +247,11 @@ void UContextReader::FillCPUContext(RawC
out->cause = 0; // Not reported in signal context.
for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i)
+#ifdef __GLIBC__
out->float_save.regs[i] = uc->uc_mcontext.fpregs.fp_r.fp_dregs[i];
-
+#else
+ out->float_save.regs[i] = uc->uc_mcontext.fpregs[i];
+#endif
out->float_save.fpcsr = uc->uc_mcontext.fpc_csr;
#if _MIPS_SIM == _ABIO32
out->float_save.fir = uc->uc_mcontext.fpc_eir; // Unused.
Index: git/src/client/linux/minidump_writer/linux_core_dumper.cc Index: git/src/client/linux/minidump_writer/linux_core_dumper.cc
=================================================================== ===================================================================
--- git.orig/src/client/linux/minidump_writer/linux_core_dumper.cc --- git.orig/src/client/linux/minidump_writer/linux_core_dumper.cc
@@ -58,20 +16,3 @@ Index: git/src/client/linux/minidump_writer/linux_core_dumper.cc
for (int i = EF_R0; i <= EF_R31; i++) for (int i = EF_R0; i <= EF_R31; i++)
info.mcontext.gregs[i - EF_R0] = status->pr_reg[i]; info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
#else // __ANDROID__ #else // __ANDROID__
Index: git/src/tools/linux/md2core/minidump-2-core.cc
===================================================================
--- git.orig/src/tools/linux/md2core/minidump-2-core.cc
+++ git/src/tools/linux/md2core/minidump-2-core.cc
@@ -516,8 +516,12 @@ ParseThreadRegisters(CrashedProcess::Thr
thread->mcontext.lo3 = rawregs->lo[2];
for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i) {
+#ifdef __GLIBC__
thread->mcontext.fpregs.fp_r.fp_fregs[i]._fp_fregs =
rawregs->float_save.regs[i];
+#else
+ thread->mcontext.fpregs[i] = rawregs->float_save.regs[i];
+#endif
}
thread->mcontext.fpc_csr = rawregs->float_save.fpcsr;
meta-oe/recipes-devtools/breakpad/breakpad_git.bb
+7 -5
View File
@@ -19,11 +19,11 @@ PV = "1.0"
SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp" SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp"
SRCREV_breakpad = "5467393a3d1e7ab929fd01d79971701bf4e2c2c6" SRCREV_breakpad = "0c0e24f709288a129d665ec27d6f089189318385"
#v1.8.0 #v1.10.0
SRCREV_gtest = "ec44c6c1675c25b9827aacd08c02433cccde7780" SRCREV_gtest = "5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081"
SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac"
SRCREV_lss = "a89bf7903f3169e6bc7b8efc10a73a7571de21cf" SRCREV_lss = "8048ece6c16c91acfe0d36d1d3cc0890ab6e945c"
SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770"
SRC_URI = "git://github.com/google/breakpad;name=breakpad \ SRC_URI = "git://github.com/google/breakpad;name=breakpad \
@@ -42,7 +42,7 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad \
file://0001-disable-calls-to-getcontext-with-musl.patch \ file://0001-disable-calls-to-getcontext-with-musl.patch \
file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \
file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \
file://dont-clobber-rsp.patch;patchdir=src/third_party/lss;striplevel=4 \ file://0001-Do-not-add-stack-pointer-to-clobber-list.patch;patchdir=src/third_party/lss \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@@ -121,3 +121,5 @@ breakpad_populate_sysroot() {
#| make: *** [src/client/linux/handler/exception_handler.o] Error 1 #| make: *** [src/client/linux/handler/exception_handler.o] Error 1
ARM_INSTRUCTION_SET_armv5 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm"
ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv4 = "arm"
TOOLCHAIN = "gcc"