summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-07-12 12:26:14 -0700
committerKhem Raj <raj.khem@gmail.com>2023-07-13 07:22:17 -0700
commitd32294095fdd3f5c7d230973d9d98d47e1e9a7b1 (patch)
treebd41c78430868ac617409e8d032fd3241a6fa751
parent3645710e73a5a1579d25cc20c26be6f8b0dbe40e (diff)
downloadmeta-openembedded-d32294095fdd3f5c7d230973d9d98d47e1e9a7b1.tar.gz
breakpad: Update to latest trunk
Fix build with latest glibc trunk 2.38+ while here drop upstreamed patches Add new dependency on zlib Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch63
-rw-r--r--meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch15
-rw-r--r--meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch34
-rw-r--r--meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch20
-rw-r--r--meta-oe/recipes-devtools/breakpad/breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch30
-rw-r--r--meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch10
-rw-r--r--meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch11
-rw-r--r--meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch8
-rw-r--r--meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch14
-rw-r--r--meta-oe/recipes-devtools/breakpad/breakpad_git.bb12
10 files changed, 38 insertions, 179 deletions
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch
deleted file mode 100644
index e572022684..0000000000
--- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From 5c63eb5d56abd4e5232add4727247965a863d851 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 15 Dec 2019 14:02:45 -0800
4Subject: [PATCH] Do not add stack pointer to clobber list
5
6It was being ignored until now when gcc 9.0 became capable
7of flagging these silent ignore via [1].
8
9We weren't actually clobbering the stack pointers here
10so it should not cause change in behavior.
11
12[1] https://gcc.gnu.org/PR52813
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16Upstream-Status: Pending
17
18 linux_syscall_support.h | 8 ++++----
19 1 file changed, 4 insertions(+), 4 deletions(-)
20
21diff --git a/linux_syscall_support.h b/linux_syscall_support.h
22index 9276f56..6e73309 100644
23--- a/linux_syscall_support.h
24+++ b/linux_syscall_support.h
25@@ -1955,7 +1955,7 @@ struct kernel_statfs {
26 LSS_ENTRYPOINT \
27 "pop %%ebx" \
28 args \
29- : "esp", "memory"); \
30+ : "memory"); \
31 LSS_RETURN(type,__res)
32 #undef _syscall0
33 #define _syscall0(type,name) \
34@@ -2012,7 +2012,7 @@ struct kernel_statfs {
35 : "i" (__NR_##name), "ri" ((long)(arg1)), \
36 "c" ((long)(arg2)), "d" ((long)(arg3)), \
37 "S" ((long)(arg4)), "D" ((long)(arg5)) \
38- : "esp", "memory"); \
39+ : "memory"); \
40 LSS_RETURN(type,__res); \
41 }
42 #undef _syscall6
43@@ -2034,7 +2034,7 @@ struct kernel_statfs {
44 : "i" (__NR_##name), "0" ((long)(&__s)), \
45 "c" ((long)(arg2)), "d" ((long)(arg3)), \
46 "S" ((long)(arg4)), "D" ((long)(arg5)) \
47- : "esp", "memory"); \
48+ : "memory"); \
49 LSS_RETURN(type,__res); \
50 }
51 LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
52@@ -2120,7 +2120,7 @@ struct kernel_statfs {
53 : "0"(-EINVAL), "i"(__NR_clone),
54 "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
55 "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
56- : "esp", "memory", "ecx", "edx", "esi", "edi");
57+ : "memory", "ecx", "edx", "esi", "edi");
58 LSS_RETURN(int, __res);
59 }
60
61--
622.24.1
63
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch
index d7a5c06753..df41b4d6c0 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch
+++ b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch
@@ -12,11 +12,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 Makefile.am | 12 ------------ 12 Makefile.am | 12 ------------
13 1 file changed, 12 deletions(-) 13 1 file changed, 12 deletions(-)
14 14
15diff --git a/Makefile.am b/Makefile.am
16index ee7454e4..69700192 100644
17--- a/Makefile.am 15--- a/Makefile.am
18+++ b/Makefile.am 16+++ b/Makefile.am
19@@ -187,10 +187,6 @@ src_client_linux_libbreakpad_client_a_SOURCES = \ 17@@ -529,10 +529,6 @@ src_client_linux_libbreakpad_client_a_SO
20 src/common/linux/linux_libc_support.cc \ 18 src/common/linux/linux_libc_support.cc \
21 src/common/linux/memory_mapped_file.cc \ 19 src/common/linux/memory_mapped_file.cc \
22 src/common/linux/safe_readlink.cc 20 src/common/linux/safe_readlink.cc
@@ -24,10 +22,10 @@ index ee7454e4..69700192 100644
24-src_client_linux_libbreakpad_client_a_SOURCES += \ 22-src_client_linux_libbreakpad_client_a_SOURCES += \
25- src/common/linux/breakpad_getcontext.S 23- src/common/linux/breakpad_getcontext.S
26-endif 24-endif
27 endif LINUX_HOST
28 25
29 if !DISABLE_PROCESSOR 26 # Client tests
30@@ -508,10 +504,6 @@ src_client_linux_linux_client_unittest_shlib_SOURCES = \ 27 src_client_linux_linux_dumper_unittest_helper_SOURCES = \
28@@ -580,10 +576,6 @@ src_client_linux_linux_client_unittest_s
31 src/processor/minidump.cc \ 29 src/processor/minidump.cc \
32 src/processor/pathname_stripper.cc \ 30 src/processor/pathname_stripper.cc \
33 src/processor/proc_maps_linux.cc 31 src/processor/proc_maps_linux.cc
@@ -38,7 +36,7 @@ index ee7454e4..69700192 100644
38 36
39 src_client_linux_linux_client_unittest_shlib_CPPFLAGS = \ 37 src_client_linux_linux_client_unittest_shlib_CPPFLAGS = \
40 $(AM_CPPFLAGS) $(TEST_CFLAGS) 38 $(AM_CPPFLAGS) $(TEST_CFLAGS)
41@@ -541,10 +533,6 @@ src_client_linux_linux_client_unittest_shlib_LDADD = \ 39@@ -613,10 +605,6 @@ src_client_linux_linux_client_unittest_s
42 src/common/string_conversion.o \ 40 src/common/string_conversion.o \
43 $(TEST_LIBS) \ 41 $(TEST_LIBS) \
44 $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) 42 $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
@@ -49,6 +47,3 @@ index ee7454e4..69700192 100644
49 if ANDROID_HOST 47 if ANDROID_HOST
50 src_client_linux_linux_client_unittest_shlib_LDFLAGS += \ 48 src_client_linux_linux_client_unittest_shlib_LDFLAGS += \
51 -llog -lm 49 -llog -lm
52--
532.30.2
54
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch
deleted file mode 100644
index afe8a61b29..0000000000
--- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 66a2b6e4ba8e2b49115043127ce4aa0fcd71ad1e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 11 May 2021 11:12:35 -0700
4Subject: [PATCH] exception_handler.cc: Match the types for SIGSTKSZ
5
6In glibc 2.34, SIGSTKSZ is a syscall which returns a long int, therefore
7current check fails
8
9| ../git/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)'
10| 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
11| | ~~~~~~~~^~~~~~~~~~~~~~~~~
12
13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 src/client/linux/handler/exception_handler.cc | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc
20index ca353c40..dc0fc4a9 100644
21--- a/src/client/linux/handler/exception_handler.cc
22+++ b/src/client/linux/handler/exception_handler.cc
23@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
24 // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
25 // the alternative stack. Ensure that the size of the alternative stack is
26 // large enough.
27- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
28+ static const unsigned kSigStackSize = std::max(16384u, (unsigned)SIGSTKSZ);
29
30 // Only set an alternative stack if there isn't already one, or if the current
31 // one is too small.
32--
332.31.1
34
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch
index f2d1fe681d..80e5a8a764 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch
+++ b/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch
@@ -12,7 +12,7 @@ Upstream-Status: Pending
12 12
13--- a/linux_syscall_support.h 13--- a/linux_syscall_support.h
14+++ b/linux_syscall_support.h 14+++ b/linux_syscall_support.h
15@@ -816,6 +816,9 @@ struct kernel_statfs { 15@@ -1006,6 +1006,9 @@ struct kernel_statx {
16 #define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG) 16 #define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG)
17 #endif 17 #endif
18 18
@@ -22,17 +22,17 @@ Upstream-Status: Pending
22 22
23 #if defined(__x86_64__) 23 #if defined(__x86_64__)
24 #ifndef ARCH_SET_GS 24 #ifndef ARCH_SET_GS
25@@ -947,6 +950,7 @@ struct kernel_statfs { 25@@ -1140,6 +1143,7 @@ struct kernel_statx {
26 #ifndef __NR_fallocate 26 #ifndef __NR_getrandom
27 #define __NR_fallocate 324 27 #define __NR_getrandom 355
28 #endif 28 #endif
29+ 29+
30 /* End of i386 definitions */ 30 /* End of i386 definitions */
31 #elif defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) 31 #elif defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
32 #ifndef __NR_setresuid 32 #ifndef __NR_setresuid
33@@ -1239,6 +1243,12 @@ struct kernel_statfs { 33@@ -1448,6 +1452,12 @@ struct kernel_statx {
34 #ifndef __NR_fallocate 34 #ifndef __NR_getrandom
35 #define __NR_fallocate 285 35 #define __NR_getrandom 318
36 #endif 36 #endif
37+#ifndef __NR_pread 37+#ifndef __NR_pread
38+#define __NR_pread __NR_pread64 38+#define __NR_pread __NR_pread64
@@ -43,9 +43,9 @@ Upstream-Status: Pending
43 /* End of x86-64 definitions */ 43 /* End of x86-64 definitions */
44 #elif defined(__mips__) 44 #elif defined(__mips__)
45 #if _MIPS_SIM == _MIPS_SIM_ABI32 45 #if _MIPS_SIM == _MIPS_SIM_ABI32
46@@ -1418,6 +1428,12 @@ struct kernel_statfs { 46@@ -1633,6 +1643,12 @@ struct kernel_statx {
47 #ifndef __NR_ioprio_get 47 #ifndef __NR_getrandom
48 #define __NR_ioprio_get (__NR_Linux + 274) 48 #define __NR_getrandom (__NR_Linux + 313)
49 #endif 49 #endif
50+ 50+
51+#undef __NR_pread 51+#undef __NR_pread
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch
deleted file mode 100644
index d6d326dd03..0000000000
--- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa Mon Sep 17 00:00:00 2001
2From: mingtaoxt xt <mingtaoxt@gmail.com>
3Date: Wed, 19 Oct 2022 19:36:13 +0800
4Subject: [PATCH] mainline version gcc-13 cannot use "uintptr_t" via "#include <string>"
5
6Change-Id: I0049bb92658b4226e32783ad4d8271787deef5f3
7Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3964166
8Reviewed-by: Mike Frysinger <vapier@chromium.org>
9
10Upstream-Status: Backport [https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3964166]
11Signed-of-by: Khem Raj <raj.khem@gmail.com>
12---
13 src/client/linux/handler/minidump_descriptor.h | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/src/client/linux/handler/minidump_descriptor.h b/src/client/linux/handler/minidump_descriptor.h
17index 4349b88f..d822c9d9 100644
18--- a/src/client/linux/handler/minidump_descriptor.h
19+++ b/src/client/linux/handler/minidump_descriptor.h
20@@ -32,6 +32,7 @@
21 #include <assert.h>
22 #include <sys/types.h>
23
24+#include <cstdint>
25 #include <string>
26
27 #include "client/linux/handler/microdump_extra_info.h"
28--
292.39.1
30
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch
index cd5546d761..81844d0d66 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch
+++ b/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch
@@ -14,7 +14,7 @@ Upstream-Status: Pending
14 14
15--- a/src/common/stabs_reader.cc 15--- a/src/common/stabs_reader.cc
16+++ b/src/common/stabs_reader.cc 16+++ b/src/common/stabs_reader.cc
17@@ -34,7 +34,9 @@ 17@@ -38,7 +38,9 @@
18 #include "common/stabs_reader.h" 18 #include "common/stabs_reader.h"
19 19
20 #include <assert.h> 20 #include <assert.h>
@@ -26,7 +26,7 @@ Upstream-Status: Pending
26 #include <string> 26 #include <string>
27--- a/src/common/stabs_reader.h 27--- a/src/common/stabs_reader.h
28+++ b/src/common/stabs_reader.h 28+++ b/src/common/stabs_reader.h
29@@ -58,6 +58,30 @@ 29@@ -54,6 +54,30 @@
30 #elif defined(HAVE_A_OUT_H) 30 #elif defined(HAVE_A_OUT_H)
31 #include <a.out.h> 31 #include <a.out.h>
32 #endif 32 #endif
@@ -59,7 +59,7 @@ Upstream-Status: Pending
59 #include <vector> 59 #include <vector>
60--- a/src/common/stabs_reader_unittest.cc 60--- a/src/common/stabs_reader_unittest.cc
61+++ b/src/common/stabs_reader_unittest.cc 61+++ b/src/common/stabs_reader_unittest.cc
62@@ -33,7 +33,9 @@ 62@@ -36,7 +36,9 @@
63 63
64 #include <assert.h> 64 #include <assert.h>
65 #include <errno.h> 65 #include <errno.h>
@@ -71,8 +71,8 @@ Upstream-Status: Pending
71 #include <string.h> 71 #include <string.h>
72--- a/configure.ac 72--- a/configure.ac
73+++ b/configure.ac 73+++ b/configure.ac
74@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, 74@@ -61,7 +61,7 @@ fi
75 AC_HEADER_STDC 75
76 AC_SYS_LARGEFILE 76 AC_SYS_LARGEFILE
77 AX_PTHREAD 77 AX_PTHREAD
78-AC_CHECK_HEADERS([a.out.h sys/mman.h sys/random.h]) 78-AC_CHECK_HEADERS([a.out.h sys/mman.h sys/random.h])
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch
index aa89959e9f..9b16dc3b2a 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch
+++ b/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch
@@ -11,19 +11,17 @@ Upstream-Status: Pending
11 src/client/linux/crash_generation/crash_generation_server.cc | 3 ++- 11 src/client/linux/crash_generation/crash_generation_server.cc | 3 ++-
12 1 file changed, 2 insertions(+), 1 deletion(-) 12 1 file changed, 2 insertions(+), 1 deletion(-)
13 13
14diff --git a/src/client/linux/crash_generation/crash_generation_server.cc b/src/client/linux/crash_generation/crash_generation_server.cc
15index 26c50a5c..2596afde 100644
16--- a/src/client/linux/crash_generation/crash_generation_server.cc 14--- a/src/client/linux/crash_generation/crash_generation_server.cc
17+++ b/src/client/linux/crash_generation/crash_generation_server.cc 15+++ b/src/client/linux/crash_generation/crash_generation_server.cc
18@@ -28,7 +28,6 @@ 16@@ -31,7 +31,6 @@
19 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 17 #endif
20 18
21 #include <assert.h> 19 #include <assert.h>
22-#include <dirent.h> 20-#include <dirent.h>
23 #include <fcntl.h> 21 #include <fcntl.h>
24 #include <limits.h> 22 #include <limits.h>
25 #include <poll.h> 23 #include <poll.h>
26@@ -49,6 +48,8 @@ 24@@ -52,6 +51,8 @@
27 #include "common/linux/guid_creator.h" 25 #include "common/linux/guid_creator.h"
28 #include "common/linux/safe_readlink.h" 26 #include "common/linux/safe_readlink.h"
29 27
@@ -32,6 +30,3 @@ index 26c50a5c..2596afde 100644
32 static const char kCommandQuit = 'x'; 30 static const char kCommandQuit = 'x';
33 31
34 namespace google_breakpad { 32 namespace google_breakpad {
35--
362.14.1
37
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch
index b4bccb44cb..ff331977b6 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch
+++ b/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch
@@ -13,8 +13,8 @@ Upstream-Status: Pending
13 13
14--- a/src/common/dwarf/elf_reader.cc 14--- a/src/common/dwarf/elf_reader.cc
15+++ b/src/common/dwarf/elf_reader.cc 15+++ b/src/common/dwarf/elf_reader.cc
16@@ -30,12 +30,16 @@ 16@@ -34,12 +34,16 @@
17 #define _GNU_SOURCE // needed for pread() 17 #include <config.h> // Must come first
18 #endif 18 #endif
19 19
20+#include <config.h> 20+#include <config.h>
@@ -32,8 +32,8 @@ Upstream-Status: Pending
32 #include <algorithm> 32 #include <algorithm>
33--- a/configure.ac 33--- a/configure.ac
34+++ b/configure.ac 34+++ b/configure.ac
35@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, 35@@ -61,7 +61,7 @@ fi
36 AC_HEADER_STDC 36
37 AC_SYS_LARGEFILE 37 AC_SYS_LARGEFILE
38 AX_PTHREAD 38 AX_PTHREAD
39-AC_CHECK_HEADERS([a.out.h stab.h sys/mman.h sys/random.h]) 39-AC_CHECK_HEADERS([a.out.h stab.h sys/mman.h sys/random.h])
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch b/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch
index 3449973629..cb323fbdcb 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch
+++ b/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch
@@ -3,16 +3,14 @@ map the mcontext_t structure for musl
3Upstream-Status: Inappropriate [need to consider Android] 3Upstream-Status: Inappropriate [need to consider Android]
4 4
5Signed-off-by: Khem Raj <raj.khem@gmail.com> 5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Index: git/src/client/linux/minidump_writer/linux_core_dumper.cc 6--- a/src/client/linux/minidump_writer/linux_core_dumper.cc
7=================================================================== 7+++ b/src/client/linux/minidump_writer/linux_core_dumper.cc
8--- git.orig/src/client/linux/minidump_writer/linux_core_dumper.cc 8@@ -214,7 +214,7 @@ bool LinuxCoreDumper::EnumerateThreads()
9+++ git/src/client/linux/minidump_writer/linux_core_dumper.cc
10@@ -196,7 +196,7 @@ bool LinuxCoreDumper::EnumerateThreads()
11 info.tgid = status->pr_pgrp; 9 info.tgid = status->pr_pgrp;
12 info.ppid = status->pr_ppid; 10 info.ppid = status->pr_ppid;
13 #if defined(__mips__) 11 #if defined(__mips__)
14-#if defined(__ANDROID__) 12-# if defined(__ANDROID__)
15+#if defined(__ANDROID__) || !defined(__GLIBC__) 13+# if defined(__ANDROID__) || !defined(__GLIBC__)
16 for (int i = EF_R0; i <= EF_R31; i++) 14 for (int i = EF_R0; i <= EF_R31; i++)
17 info.mcontext.gregs[i - EF_R0] = status->pr_reg[i]; 15 info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
18 #else // __ANDROID__ 16 # else // __ANDROID__
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
index d1d338c6a8..3462b846d3 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
+++ b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
@@ -6,11 +6,12 @@ SUMMARY = "An open-source multi-platform crash reporting system"
6DESCRIPTION = "Breakpad is a library and tool suite that allows you to distribute an application to users with compiler-provided debugging information removed, record crashes in compact \"minidump\" files, send them back to your server, and produce C and C++ stack traces from these minidumps. " 6DESCRIPTION = "Breakpad is a library and tool suite that allows you to distribute an application to users with compiler-provided debugging information removed, record crashes in compact \"minidump\" files, send them back to your server, and produce C and C++ stack traces from these minidumps. "
7HOMEPAGE = "https://code.google.com/p/google-breakpad/" 7HOMEPAGE = "https://code.google.com/p/google-breakpad/"
8LICENSE = "BSD-3-Clause" 8LICENSE = "BSD-3-Clause"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=8bb274ebd1901085fd71a8d8afe8831b" 9LIC_FILES_CHKSUM = "file://LICENSE;md5=07aeb530115539d62cacf9942fa60cac"
10SECTION = "libs" 10SECTION = "libs"
11 11
12inherit autotools 12inherit autotools
13 13
14DEPENDS += "zlib"
14DEPENDS:append:libc-musl = " libucontext" 15DEPENDS:append:libc-musl = " libucontext"
15 16
16BBCLASSEXTEND = "native" 17BBCLASSEXTEND = "native"
@@ -21,11 +22,11 @@ PV = "1.0"
21 22
22SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp" 23SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp"
23 24
24SRCREV_breakpad = "8b22babdf894e5aa98b2dbbe103f7e3856a71944" 25SRCREV_breakpad = "7a1a190f4f68e8a3e06788498f50a4d5520a69f3"
25#v1.10.0 26#v1.10.0
26SRCREV_gtest = "4fe018038f87675c083d0cfb6a6b57c274fb1753" 27SRCREV_gtest = "e2239ee6043f73722e7aa812a459f54a28552929"
27SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" 28SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac"
28SRCREV_lss = "fd00dbbd0c06a309c657d89e9430143b179ff6db" 29SRCREV_lss = "9719c1e1e676814c456b55f5f070eabad6709d31"
29SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" 30SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770"
30 31
31SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \ 32SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \
@@ -40,11 +41,8 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=h
40 file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \ 41 file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \
41 file://mcontext.patch \ 42 file://mcontext.patch \
42 file://0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch \ 43 file://0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch \
43 file://0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \
44 file://0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch \
45 file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ 44 file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \
46 file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ 45 file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \
47 file://0001-Do-not-add-stack-pointer-to-clobber-list.patch;patchdir=src/third_party/lss \
48" 46"
49S = "${WORKDIR}/git" 47S = "${WORKDIR}/git"
50 48
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-05-30 08:48:41 +0000