diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2022-04-22 11:07:30 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-04-22 17:58:09 -0700 |
commit | c7ce2371c021d713f5328a0a50b23a21f2e4792b (patch) | |
tree | 5b8a8eb72640ab4b47b99e92ea0a13aa1b8d976d | |
parent | 64156a6f8f3b4527c4732c91936aee0a167acb48 (diff) | |
download | meta-openembedded-c7ce2371c021d713f5328a0a50b23a21f2e4792b.tar.gz |
crash: Upgrade to 8.0.0
The bundled gdb upgraded to 10.2 [1] and remove related patches
against the previous gdb 7.6.
[1] https://github.com/crash-utility/crash/commit/ec568e2ea515b66343d3488d5d4b9a625d55b7ae
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch | 36 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch | 79 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch | 37 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/crash/crash_8.0.0.bb (renamed from meta-oe/recipes-kernel/crash/crash_7.3.0.bb) | 12 |
6 files changed, 3 insertions, 227 deletions
diff --git a/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch b/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch deleted file mode 100644 index 8355fe44ea..0000000000 --- a/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 52fc1a7c17768fd52c3577d21dad84e8babb94b5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dengke Du <dengke.du@windriver.com> | ||
3 | Date: Thu, 6 Apr 2017 23:01:14 -0400 | ||
4 | Subject: [PATCH 2/3] crash: fix build error unknown type name 'gdb_fpregset_t' | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Dengke Du <dengke.du@windriver.com> | ||
9 | --- | ||
10 | gdb-7.6/gdb/gdb_proc_service.h | 3 +-- | ||
11 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/gdb-7.6/gdb/gdb_proc_service.h b/gdb-7.6/gdb/gdb_proc_service.h | ||
14 | index 8bc6088..99c6496 100644 | ||
15 | --- a/gdb-7.6/gdb/gdb_proc_service.h | ||
16 | +++ b/gdb-7.6/gdb/gdb_proc_service.h | ||
17 | @@ -20,6 +20,7 @@ | ||
18 | #define GDB_PROC_SERVICE_H | ||
19 | |||
20 | #include <sys/types.h> | ||
21 | +#include "gregset.h" | ||
22 | |||
23 | #ifdef HAVE_PROC_SERVICE_H | ||
24 | #include <proc_service.h> | ||
25 | @@ -53,8 +54,6 @@ | ||
26 | #include <sys/procfs.h> | ||
27 | #endif | ||
28 | |||
29 | -#include "gregset.h" | ||
30 | - | ||
31 | /* Functions in this interface return one of these status codes. */ | ||
32 | typedef enum | ||
33 | { | ||
34 | -- | ||
35 | 2.8.1 | ||
36 | |||
diff --git a/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch b/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch deleted file mode 100644 index 1f4bd01da4..0000000000 --- a/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From c7950ef5228adc52a500b4fc67d7e48c3c09c1df Mon Sep 17 00:00:00 2001 | ||
2 | From: Dengke Du <dengke.du@windriver.com> | ||
3 | Date: Thu, 6 Apr 2017 23:02:44 -0400 | ||
4 | Subject: [PATCH 3/3] crash: detect the sysroot's glibc header file | ||
5 | |||
6 | This is cross compile, so let the Makefile detect the sysroot's glibc | ||
7 | header file, not the host's glibc header file. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Dengke Du <dengke.du@windriver.com> | ||
12 | --- | ||
13 | Makefile | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile b/Makefile | ||
17 | index b6b7e80..94f21a5 100644 | ||
18 | --- a/Makefile | ||
19 | +++ b/Makefile | ||
20 | @@ -264,8 +264,8 @@ gdb_patch: | ||
21 | if [ "${ARCH}" = "x86_64" ] && [ "${TARGET}" = "PPC64" ] && [ -f ${GDB}-ppc64le-support.patch ]; then \ | ||
22 | patch -d ${GDB} -p1 -F0 < ${GDB}-ppc64le-support.patch ; \ | ||
23 | fi | ||
24 | - if [ -f /usr/include/proc_service.h ]; then \ | ||
25 | - grep 'extern ps_err_e ps_get_thread_area (struct' /usr/include/proc_service.h; \ | ||
26 | + if [ -f ${RECIPE_SYSROOT}/usr/include/proc_service.h ]; then \ | ||
27 | + grep 'extern ps_err_e ps_get_thread_area (struct' ${RECIPE_SYSROOT}/usr/include/proc_service.h; \ | ||
28 | if [ $$? -eq 0 ]; then \ | ||
29 | patch -p0 < ${GDB}-proc_service.h.patch; \ | ||
30 | fi; \ | ||
31 | -- | ||
32 | 2.8.1 | ||
33 | |||
diff --git a/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch b/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch deleted file mode 100644 index 37d43b8887..0000000000 --- a/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | It fails to build crash for mips with error: | ||
4 | |||
5 | | mips-wrs-linux-gcc: error: unrecognized command line option '-m32' | ||
6 | | Makefile:291: recipe for target 'make_build_data' failed | ||
7 | |||
8 | So remove the unrecognized option '-m32' for mips. | ||
9 | |||
10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
11 | --- | ||
12 | diff --git a/configure.c b/configure.c | ||
13 | index cf1973b..71e97b3 100644 | ||
14 | --- a/configure.c | ||
15 | +++ b/configure.c | ||
16 | @@ -155,7 +155,7 @@ void add_extra_lib(char *); | ||
17 | #define TARGET_CFLAGS_PPC64_ON_X86_64 "TARGET_CFLAGS=" | ||
18 | #define TARGET_CFLAGS_MIPS "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" | ||
19 | #define TARGET_CFLAGS_MIPS_ON_X86 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" | ||
20 | -#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-m32 -D_FILE_OFFSET_BITS=64" | ||
21 | +#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" | ||
22 | #define TARGET_CFLAGS_MIPS64 "TARGET_CFLAGS=" | ||
23 | #define TARGET_CFLAGS_SPARC64 "TARGET_CFLAGS=" | ||
24 | |||
25 | @@ -167,7 +167,7 @@ void add_extra_lib(char *); | ||
26 | #define GDB_TARGET_ARM64_ON_X86_64 "GDB_CONF_FLAGS=--target=aarch64-elf-linux" /* TBD */ | ||
27 | #define GDB_TARGET_PPC64_ON_X86_64 "GDB_CONF_FLAGS=--target=powerpc64le-unknown-linux-gnu" | ||
28 | #define GDB_TARGET_MIPS_ON_X86 "GDB_CONF_FLAGS=--target=mipsel-elf-linux" | ||
29 | -#define GDB_TARGET_MIPS_ON_X86_64 "GDB_CONF_FLAGS=--target=mipsel-elf-linux CFLAGS=-m32" | ||
30 | +#define GDB_TARGET_MIPS_ON_X86_64 "GDB_CONF_FLAGS=--target=mipsel-elf-linux" | ||
31 | |||
32 | /* | ||
33 | * The original plan was to allow the use of a particular version | ||
diff --git a/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch b/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch deleted file mode 100644 index 0185b57045..0000000000 --- a/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch +++ /dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=92fc615 | ||
4 | |||
5 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
6 | -- | ||
7 | From 92fc6153a6fdf2a027d9780f5945712aafad4a9e Mon Sep 17 00:00:00 2001 | ||
8 | From: Mike Frysinger <vapier@gentoo.org> | ||
9 | Date: Sun, 29 Mar 2015 15:59:01 -0400 | ||
10 | Subject: [PATCH] sim: common: sim-arange: fix extern inline handling | ||
11 | |||
12 | With newer versions of gcc (5.x), the extern inline we're using with the | ||
13 | sim-arange module no longer works. Since this code really wants the gnu | ||
14 | inline semantics, use that attribute explicitly. | ||
15 | |||
16 | Reported-by: DJ Delorie <dj@redhat.com> | ||
17 | Reported-by: Joel Sherrill <joel.sherrill@oarcorp.com> | ||
18 | --- | ||
19 | gdb-7.6/sim/common/sim-arange.h | 20 ++++++++++++-------- | ||
20 | gdb-7.6/sim/common/sim-inline.h | 4 +++- | ||
21 | 2 files changed, 15 insertions(+), 9 deletions(-) | ||
22 | |||
23 | diff --git a/gdb-7.6/sim/common/sim-arange.h b/gdb-7.6/sim/common/sim-arange.h | ||
24 | index 73117f3..de842c9 100644 | ||
25 | --- a/gdb-7.6/sim/common/sim-arange.h | ||
26 | +++ b/gdb-7.6/sim/common/sim-arange.h | ||
27 | @@ -60,22 +60,26 @@ extern void sim_addr_range_delete (ADDR_RANGE * /*ar*/, | ||
28 | address_word /*start*/, | ||
29 | address_word /*end*/); | ||
30 | |||
31 | +/* TODO: This should get moved into sim-inline.h. */ | ||
32 | +#ifdef HAVE_INLINE | ||
33 | +#ifdef SIM_ARANGE_C | ||
34 | +#define SIM_ARANGE_INLINE INLINE | ||
35 | +#else | ||
36 | +#define SIM_ARANGE_INLINE EXTERN_INLINE | ||
37 | +#endif | ||
38 | +#else | ||
39 | +#define SIM_ARANGE_INLINE EXTERN | ||
40 | +#endif | ||
41 | + | ||
42 | /* Return non-zero if ADDR is in range AR, traversing the entire tree. | ||
43 | If no range is specified, that is defined to mean "everything". */ | ||
44 | -extern INLINE int | ||
45 | +SIM_ARANGE_INLINE int | ||
46 | sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/); | ||
47 | #define ADDR_RANGE_HIT_P(ar, addr) \ | ||
48 | ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr))) | ||
49 | |||
50 | #ifdef HAVE_INLINE | ||
51 | -#ifdef SIM_ARANGE_C | ||
52 | -#define SIM_ARANGE_INLINE INLINE | ||
53 | -#else | ||
54 | -#define SIM_ARANGE_INLINE EXTERN_INLINE | ||
55 | -#endif | ||
56 | #include "sim-arange.c" | ||
57 | -#else | ||
58 | -#define SIM_ARANGE_INLINE | ||
59 | #endif | ||
60 | #define SIM_ARANGE_C_INCLUDED | ||
61 | |||
62 | diff --git a/gdb-7.6/sim/common/sim-inline.h b/gdb-7.6/sim/common/sim-inline.h | ||
63 | index af75562..8a9c286 100644 | ||
64 | --- a/gdb-7.6/sim/common/sim-inline.h | ||
65 | +++ b/gdb-7.6/sim/common/sim-inline.h | ||
66 | @@ -303,7 +303,9 @@ | ||
67 | /* ??? Temporary, pending decision to always use extern inline and do a vast | ||
68 | cleanup of inline support. */ | ||
69 | #ifndef INLINE2 | ||
70 | -#if defined (__GNUC__) | ||
71 | +#if defined (__GNUC_GNU_INLINE__) || defined (__GNUC_STDC_INLINE__) | ||
72 | +#define INLINE2 __inline__ __attribute__ ((__gnu_inline__)) | ||
73 | +#elif defined (__GNUC__) | ||
74 | #define INLINE2 __inline__ | ||
75 | #else | ||
76 | #define INLINE2 /*inline*/ | ||
77 | -- | ||
78 | 2.6.1 | ||
79 | |||
diff --git a/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch b/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch deleted file mode 100644 index 77a287f146..0000000000 --- a/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | https://sourceware.org/git/?p=binutils-gdb.git;h=0d8a6ab | ||
4 | |||
5 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
6 | --- | ||
7 | From 0d8a6ab7d39d28fb1557e2a62e9e4b336341ab34 Mon Sep 17 00:00:00 2001 | ||
8 | From: Aaro Koskinen <aaro.koskinen@iki.fi> | ||
9 | Date: Mon, 17 Feb 2014 17:12:59 -0500 | ||
10 | Subject: [PATCH] sim: ppc: drop $(LIBS) from psim dependency | ||
11 | |||
12 | When cross-compiling GDB for PPC, there's a prerequisite "-lz" for psim | ||
13 | that results in a build failure. With such prerequisite, GNU Make will | ||
14 | try to search the library from build machine's /usr/lib which is wrong. | ||
15 | On 64-bit Linux build machines the compilation will fail because of this. | ||
16 | |||
17 | URL: https://sourceware.org/bugzilla/show_bug.cgi?id=12202 | ||
18 | --- | ||
19 | sim/ppc/Makefile.in | 2 +- | ||
20 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
21 | |||
22 | diff --git a/gdb-7.6/sim/ppc/Makefile.in b/gdb-7.6/sim/ppc/Makefile.in | ||
23 | index b811f6f..740bdb0 100644 | ||
24 | --- a/gdb-7.6/sim/ppc/Makefile.in | ||
25 | +++ b/gdb-7.6/sim/ppc/Makefile.in | ||
26 | @@ -552,7 +552,7 @@ PACKAGE_SRC = @sim_pk_src@ | ||
27 | PACKAGE_OBJ = @sim_pk_obj@ | ||
28 | |||
29 | |||
30 | -psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(LIBINTL_DEP) | ||
31 | +psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) | ||
32 | $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) | ||
33 | |||
34 | run: psim | ||
35 | -- | ||
36 | 1.9.4 | ||
37 | |||
diff --git a/meta-oe/recipes-kernel/crash/crash_7.3.0.bb b/meta-oe/recipes-kernel/crash/crash_8.0.0.bb index d4aa0d52b0..4ea5b67de1 100644 --- a/meta-oe/recipes-kernel/crash/crash_7.3.0.bb +++ b/meta-oe/recipes-kernel/crash/crash_8.0.0.bb | |||
@@ -14,22 +14,16 @@ DEPENDS = "zlib readline coreutils-native ncurses-native" | |||
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=https \ | 16 | SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=https \ |
17 | ${GNU_MIRROR}/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ | 17 | ${GNU_MIRROR}/gdb/gdb-10.2.tar.gz;name=gdb;subdir=git \ |
18 | file://7001force_define_architecture.patch \ | 18 | file://7001force_define_architecture.patch \ |
19 | file://7003cross_ranlib.patch \ | 19 | file://7003cross_ranlib.patch \ |
20 | file://0001-cross_add_configure_option.patch \ | 20 | file://0001-cross_add_configure_option.patch \ |
21 | file://sim-ppc-drop-LIBS-from-psim-dependency.patch \ | ||
22 | file://sim-common-sim-arange-fix-extern-inline-handling.patch \ | ||
23 | file://donnot-extract-gdb-during-do-compile.patch \ | 21 | file://donnot-extract-gdb-during-do-compile.patch \ |
24 | file://gdb_build_jobs_and_not_write_crash_target.patch \ | 22 | file://gdb_build_jobs_and_not_write_crash_target.patch \ |
25 | file://remove-unrecognized-gcc-option-m32-for-mips.patch \ | ||
26 | file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ | ||
27 | file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ | ||
28 | " | 23 | " |
29 | SRCREV = "2a3e546942ab560f050ab77e8c7828b06513b3f0" | 24 | SRCREV = "ec568e2ea515b66343d3488d5d4b9a625d55b7ae" |
30 | 25 | ||
31 | SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" | 26 | SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350" |
32 | SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" | ||
33 | 27 | ||
34 | UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases" | 28 | UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases" |
35 | 29 | ||