Message ID | 20220422030730.2556794-1-mingli.yu@windriver.com |
---|---|
State | New |
Headers | show |
Series | [meta-oe] crash: Upgrade to 8.0.0 | expand |
fails to build on mips https://errors.yoctoproject.org/Errors/Build/144761/ On Thu, Apr 21, 2022 at 8:07 PM Yu, Mingli <mingli.yu@windriver.com> wrote: > > From: Mingli Yu <mingli.yu@windriver.com> > > 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> > --- > ...error-unknown-type-name-gdb_fpregset.patch | 36 --------- > ...tect-the-sysroot-s-glibc-header-file.patch | 33 -------- > ...unrecognized-gcc-option-m32-for-mips.patch | 33 -------- > ...im-arange-fix-extern-inline-handling.patch | 79 ------------------- > ...m-ppc-drop-LIBS-from-psim-dependency.patch | 37 --------- > .../crash/{crash_7.3.0.bb => crash_8.0.0.bb} | 12 +-- > 6 files changed, 3 insertions(+), 227 deletions(-) > delete mode 100644 meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch > delete mode 100644 meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch > delete mode 100644 meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch > delete mode 100644 meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch > delete mode 100644 meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch > rename meta-oe/recipes-kernel/crash/{crash_7.3.0.bb => crash_8.0.0.bb} (87%) > > 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 8355fe44e..000000000 > --- a/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From 52fc1a7c17768fd52c3577d21dad84e8babb94b5 Mon Sep 17 00:00:00 2001 > -From: Dengke Du <dengke.du@windriver.com> > -Date: Thu, 6 Apr 2017 23:01:14 -0400 > -Subject: [PATCH 2/3] crash: fix build error unknown type name 'gdb_fpregset_t' > - > -Upstream-Status: Pending > - > -Signed-off-by: Dengke Du <dengke.du@windriver.com> > ---- > - gdb-7.6/gdb/gdb_proc_service.h | 3 +-- > - 1 file changed, 1 insertion(+), 2 deletions(-) > - > -diff --git a/gdb-7.6/gdb/gdb_proc_service.h b/gdb-7.6/gdb/gdb_proc_service.h > -index 8bc6088..99c6496 100644 > ---- a/gdb-7.6/gdb/gdb_proc_service.h > -+++ b/gdb-7.6/gdb/gdb_proc_service.h > -@@ -20,6 +20,7 @@ > - #define GDB_PROC_SERVICE_H > - > - #include <sys/types.h> > -+#include "gregset.h" > - > - #ifdef HAVE_PROC_SERVICE_H > - #include <proc_service.h> > -@@ -53,8 +54,6 @@ > - #include <sys/procfs.h> > - #endif > - > --#include "gregset.h" > -- > - /* Functions in this interface return one of these status codes. */ > - typedef enum > - { > --- > -2.8.1 > - > 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 1f4bd01da..000000000 > --- a/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From c7950ef5228adc52a500b4fc67d7e48c3c09c1df Mon Sep 17 00:00:00 2001 > -From: Dengke Du <dengke.du@windriver.com> > -Date: Thu, 6 Apr 2017 23:02:44 -0400 > -Subject: [PATCH 3/3] crash: detect the sysroot's glibc header file > - > -This is cross compile, so let the Makefile detect the sysroot's glibc > -header file, not the host's glibc header file. > - > -Upstream-Status: Pending > - > -Signed-off-by: Dengke Du <dengke.du@windriver.com> > ---- > - Makefile | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index b6b7e80..94f21a5 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -264,8 +264,8 @@ gdb_patch: > - if [ "${ARCH}" = "x86_64" ] && [ "${TARGET}" = "PPC64" ] && [ -f ${GDB}-ppc64le-support.patch ]; then \ > - patch -d ${GDB} -p1 -F0 < ${GDB}-ppc64le-support.patch ; \ > - fi > -- if [ -f /usr/include/proc_service.h ]; then \ > -- grep 'extern ps_err_e ps_get_thread_area (struct' /usr/include/proc_service.h; \ > -+ if [ -f ${RECIPE_SYSROOT}/usr/include/proc_service.h ]; then \ > -+ grep 'extern ps_err_e ps_get_thread_area (struct' ${RECIPE_SYSROOT}/usr/include/proc_service.h; \ > - if [ $$? -eq 0 ]; then \ > - patch -p0 < ${GDB}-proc_service.h.patch; \ > - fi; \ > --- > -2.8.1 > - > 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 37d43b888..000000000 > --- a/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -Upstream-Status: Pending > - > -It fails to build crash for mips with error: > - > -| mips-wrs-linux-gcc: error: unrecognized command line option '-m32' > -| Makefile:291: recipe for target 'make_build_data' failed > - > -So remove the unrecognized option '-m32' for mips. > - > -Signed-off-by: Kai Kang <kai.kang@windriver.com> > ---- > -diff --git a/configure.c b/configure.c > -index cf1973b..71e97b3 100644 > ---- a/configure.c > -+++ b/configure.c > -@@ -155,7 +155,7 @@ void add_extra_lib(char *); > - #define TARGET_CFLAGS_PPC64_ON_X86_64 "TARGET_CFLAGS=" > - #define TARGET_CFLAGS_MIPS "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" > - #define TARGET_CFLAGS_MIPS_ON_X86 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" > --#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-m32 -D_FILE_OFFSET_BITS=64" > -+#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" > - #define TARGET_CFLAGS_MIPS64 "TARGET_CFLAGS=" > - #define TARGET_CFLAGS_SPARC64 "TARGET_CFLAGS=" > - > -@@ -167,7 +167,7 @@ void add_extra_lib(char *); > - #define GDB_TARGET_ARM64_ON_X86_64 "GDB_CONF_FLAGS=--target=aarch64-elf-linux" /* TBD */ > - #define GDB_TARGET_PPC64_ON_X86_64 "GDB_CONF_FLAGS=--target=powerpc64le-unknown-linux-gnu" > - #define GDB_TARGET_MIPS_ON_X86 "GDB_CONF_FLAGS=--target=mipsel-elf-linux" > --#define GDB_TARGET_MIPS_ON_X86_64 "GDB_CONF_FLAGS=--target=mipsel-elf-linux CFLAGS=-m32" > -+#define GDB_TARGET_MIPS_ON_X86_64 "GDB_CONF_FLAGS=--target=mipsel-elf-linux" > - > - /* > - * 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 0185b5704..000000000 > --- a/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch > +++ /dev/null > @@ -1,79 +0,0 @@ > -Upstream-Status: Backport > - > -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=92fc615 > - > -Signed-off-by: Kai Kang <kai.kang@windriver.com> > --- > -From 92fc6153a6fdf2a027d9780f5945712aafad4a9e Mon Sep 17 00:00:00 2001 > -From: Mike Frysinger <vapier@gentoo.org> > -Date: Sun, 29 Mar 2015 15:59:01 -0400 > -Subject: [PATCH] sim: common: sim-arange: fix extern inline handling > - > -With newer versions of gcc (5.x), the extern inline we're using with the > -sim-arange module no longer works. Since this code really wants the gnu > -inline semantics, use that attribute explicitly. > - > -Reported-by: DJ Delorie <dj@redhat.com> > -Reported-by: Joel Sherrill <joel.sherrill@oarcorp.com> > ---- > - gdb-7.6/sim/common/sim-arange.h | 20 ++++++++++++-------- > - gdb-7.6/sim/common/sim-inline.h | 4 +++- > - 2 files changed, 15 insertions(+), 9 deletions(-) > - > -diff --git a/gdb-7.6/sim/common/sim-arange.h b/gdb-7.6/sim/common/sim-arange.h > -index 73117f3..de842c9 100644 > ---- a/gdb-7.6/sim/common/sim-arange.h > -+++ b/gdb-7.6/sim/common/sim-arange.h > -@@ -60,22 +60,26 @@ extern void sim_addr_range_delete (ADDR_RANGE * /*ar*/, > - address_word /*start*/, > - address_word /*end*/); > - > -+/* TODO: This should get moved into sim-inline.h. */ > -+#ifdef HAVE_INLINE > -+#ifdef SIM_ARANGE_C > -+#define SIM_ARANGE_INLINE INLINE > -+#else > -+#define SIM_ARANGE_INLINE EXTERN_INLINE > -+#endif > -+#else > -+#define SIM_ARANGE_INLINE EXTERN > -+#endif > -+ > - /* Return non-zero if ADDR is in range AR, traversing the entire tree. > - If no range is specified, that is defined to mean "everything". */ > --extern INLINE int > -+SIM_ARANGE_INLINE int > - sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/); > - #define ADDR_RANGE_HIT_P(ar, addr) \ > - ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr))) > - > - #ifdef HAVE_INLINE > --#ifdef SIM_ARANGE_C > --#define SIM_ARANGE_INLINE INLINE > --#else > --#define SIM_ARANGE_INLINE EXTERN_INLINE > --#endif > - #include "sim-arange.c" > --#else > --#define SIM_ARANGE_INLINE > - #endif > - #define SIM_ARANGE_C_INCLUDED > - > -diff --git a/gdb-7.6/sim/common/sim-inline.h b/gdb-7.6/sim/common/sim-inline.h > -index af75562..8a9c286 100644 > ---- a/gdb-7.6/sim/common/sim-inline.h > -+++ b/gdb-7.6/sim/common/sim-inline.h > -@@ -303,7 +303,9 @@ > - /* ??? Temporary, pending decision to always use extern inline and do a vast > - cleanup of inline support. */ > - #ifndef INLINE2 > --#if defined (__GNUC__) > -+#if defined (__GNUC_GNU_INLINE__) || defined (__GNUC_STDC_INLINE__) > -+#define INLINE2 __inline__ __attribute__ ((__gnu_inline__)) > -+#elif defined (__GNUC__) > - #define INLINE2 __inline__ > - #else > - #define INLINE2 /*inline*/ > --- > -2.6.1 > - > 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 77a287f14..000000000 > --- a/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -Upstream-Status: Backport > - > -https://sourceware.org/git/?p=binutils-gdb.git;h=0d8a6ab > - > -Signed-off-by: Kai Kang <kai.kang@windriver.com> > ---- > -From 0d8a6ab7d39d28fb1557e2a62e9e4b336341ab34 Mon Sep 17 00:00:00 2001 > -From: Aaro Koskinen <aaro.koskinen@iki.fi> > -Date: Mon, 17 Feb 2014 17:12:59 -0500 > -Subject: [PATCH] sim: ppc: drop $(LIBS) from psim dependency > - > -When cross-compiling GDB for PPC, there's a prerequisite "-lz" for psim > -that results in a build failure. With such prerequisite, GNU Make will > -try to search the library from build machine's /usr/lib which is wrong. > -On 64-bit Linux build machines the compilation will fail because of this. > - > -URL: https://sourceware.org/bugzilla/show_bug.cgi?id=12202 > ---- > - sim/ppc/Makefile.in | 2 +- > - 1 files changed, 1 insertions(+), 1 deletions(-) > - > -diff --git a/gdb-7.6/sim/ppc/Makefile.in b/gdb-7.6/sim/ppc/Makefile.in > -index b811f6f..740bdb0 100644 > ---- a/gdb-7.6/sim/ppc/Makefile.in > -+++ b/gdb-7.6/sim/ppc/Makefile.in > -@@ -552,7 +552,7 @@ PACKAGE_SRC = @sim_pk_src@ > - PACKAGE_OBJ = @sim_pk_obj@ > - > - > --psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(LIBINTL_DEP) > -+psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) > - $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) > - > - run: psim > --- > -1.9.4 > - > diff --git a/meta-oe/recipes-kernel/crash/crash_7.3.0.bb b/meta-oe/recipes-kernel/crash/crash_8.0.0.bb > similarity index 87% > rename from meta-oe/recipes-kernel/crash/crash_7.3.0.bb > rename to meta-oe/recipes-kernel/crash/crash_8.0.0.bb > index d4aa0d52b..4ea5b67de 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" > > S = "${WORKDIR}/git" > SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=https \ > - ${GNU_MIRROR}/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ > + ${GNU_MIRROR}/gdb/gdb-10.2.tar.gz;name=gdb;subdir=git \ > file://7001force_define_architecture.patch \ > file://7003cross_ranlib.patch \ > file://0001-cross_add_configure_option.patch \ > - file://sim-ppc-drop-LIBS-from-psim-dependency.patch \ > - file://sim-common-sim-arange-fix-extern-inline-handling.patch \ > file://donnot-extract-gdb-during-do-compile.patch \ > file://gdb_build_jobs_and_not_write_crash_target.patch \ > - file://remove-unrecognized-gcc-option-m32-for-mips.patch \ > - file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ > - file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ > " > -SRCREV = "2a3e546942ab560f050ab77e8c7828b06513b3f0" > +SRCREV = "ec568e2ea515b66343d3488d5d4b9a625d55b7ae" > > -SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" > -SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" > +SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350" > > UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases" > > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#96730): https://lists.openembedded.org/g/openembedded-devel/message/96730 > Mute This Topic: https://lists.openembedded.org/mt/90620887/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 4/21/22 20:07, Yu, Mingli wrote: > From: Mingli Yu <mingli.yu@windriver.com> > > The bundled gdb upgraded to 10.2 [1] and remove related patches > against the previous gdb 7.6. Do we need to be in-sync with the GDB in core? - armin > > [1] https://github.com/crash-utility/crash/commit/ec568e2ea515b66343d3488d5d4b9a625d55b7ae > > Signed-off-by: Mingli Yu <mingli.yu@windriver.com> > --- > ...error-unknown-type-name-gdb_fpregset.patch | 36 --------- > ...tect-the-sysroot-s-glibc-header-file.patch | 33 -------- > ...unrecognized-gcc-option-m32-for-mips.patch | 33 -------- > ...im-arange-fix-extern-inline-handling.patch | 79 ------------------- > ...m-ppc-drop-LIBS-from-psim-dependency.patch | 37 --------- > .../crash/{crash_7.3.0.bb => crash_8.0.0.bb} | 12 +-- > 6 files changed, 3 insertions(+), 227 deletions(-) > delete mode 100644 meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch > delete mode 100644 meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch > delete mode 100644 meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch > delete mode 100644 meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch > delete mode 100644 meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch > rename meta-oe/recipes-kernel/crash/{crash_7.3.0.bb => crash_8.0.0.bb} (87%) > > 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 8355fe44e..000000000 > --- a/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From 52fc1a7c17768fd52c3577d21dad84e8babb94b5 Mon Sep 17 00:00:00 2001 > -From: Dengke Du <dengke.du@windriver.com> > -Date: Thu, 6 Apr 2017 23:01:14 -0400 > -Subject: [PATCH 2/3] crash: fix build error unknown type name 'gdb_fpregset_t' > - > -Upstream-Status: Pending > - > -Signed-off-by: Dengke Du <dengke.du@windriver.com> > ---- > - gdb-7.6/gdb/gdb_proc_service.h | 3 +-- > - 1 file changed, 1 insertion(+), 2 deletions(-) > - > -diff --git a/gdb-7.6/gdb/gdb_proc_service.h b/gdb-7.6/gdb/gdb_proc_service.h > -index 8bc6088..99c6496 100644 > ---- a/gdb-7.6/gdb/gdb_proc_service.h > -+++ b/gdb-7.6/gdb/gdb_proc_service.h > -@@ -20,6 +20,7 @@ > - #define GDB_PROC_SERVICE_H > - > - #include <sys/types.h> > -+#include "gregset.h" > - > - #ifdef HAVE_PROC_SERVICE_H > - #include <proc_service.h> > -@@ -53,8 +54,6 @@ > - #include <sys/procfs.h> > - #endif > - > --#include "gregset.h" > -- > - /* Functions in this interface return one of these status codes. */ > - typedef enum > - { > --- > -2.8.1 > - > 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 1f4bd01da..000000000 > --- a/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From c7950ef5228adc52a500b4fc67d7e48c3c09c1df Mon Sep 17 00:00:00 2001 > -From: Dengke Du <dengke.du@windriver.com> > -Date: Thu, 6 Apr 2017 23:02:44 -0400 > -Subject: [PATCH 3/3] crash: detect the sysroot's glibc header file > - > -This is cross compile, so let the Makefile detect the sysroot's glibc > -header file, not the host's glibc header file. > - > -Upstream-Status: Pending > - > -Signed-off-by: Dengke Du <dengke.du@windriver.com> > ---- > - Makefile | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index b6b7e80..94f21a5 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -264,8 +264,8 @@ gdb_patch: > - if [ "${ARCH}" = "x86_64" ] && [ "${TARGET}" = "PPC64" ] && [ -f ${GDB}-ppc64le-support.patch ]; then \ > - patch -d ${GDB} -p1 -F0 < ${GDB}-ppc64le-support.patch ; \ > - fi > -- if [ -f /usr/include/proc_service.h ]; then \ > -- grep 'extern ps_err_e ps_get_thread_area (struct' /usr/include/proc_service.h; \ > -+ if [ -f ${RECIPE_SYSROOT}/usr/include/proc_service.h ]; then \ > -+ grep 'extern ps_err_e ps_get_thread_area (struct' ${RECIPE_SYSROOT}/usr/include/proc_service.h; \ > - if [ $$? -eq 0 ]; then \ > - patch -p0 < ${GDB}-proc_service.h.patch; \ > - fi; \ > --- > -2.8.1 > - > 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 37d43b888..000000000 > --- a/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -Upstream-Status: Pending > - > -It fails to build crash for mips with error: > - > -| mips-wrs-linux-gcc: error: unrecognized command line option '-m32' > -| Makefile:291: recipe for target 'make_build_data' failed > - > -So remove the unrecognized option '-m32' for mips. > - > -Signed-off-by: Kai Kang <kai.kang@windriver.com> > ---- > -diff --git a/configure.c b/configure.c > -index cf1973b..71e97b3 100644 > ---- a/configure.c > -+++ b/configure.c > -@@ -155,7 +155,7 @@ void add_extra_lib(char *); > - #define TARGET_CFLAGS_PPC64_ON_X86_64 "TARGET_CFLAGS=" > - #define TARGET_CFLAGS_MIPS "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" > - #define TARGET_CFLAGS_MIPS_ON_X86 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" > --#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-m32 -D_FILE_OFFSET_BITS=64" > -+#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" > - #define TARGET_CFLAGS_MIPS64 "TARGET_CFLAGS=" > - #define TARGET_CFLAGS_SPARC64 "TARGET_CFLAGS=" > - > -@@ -167,7 +167,7 @@ void add_extra_lib(char *); > - #define GDB_TARGET_ARM64_ON_X86_64 "GDB_CONF_FLAGS=--target=aarch64-elf-linux" /* TBD */ > - #define GDB_TARGET_PPC64_ON_X86_64 "GDB_CONF_FLAGS=--target=powerpc64le-unknown-linux-gnu" > - #define GDB_TARGET_MIPS_ON_X86 "GDB_CONF_FLAGS=--target=mipsel-elf-linux" > --#define GDB_TARGET_MIPS_ON_X86_64 "GDB_CONF_FLAGS=--target=mipsel-elf-linux CFLAGS=-m32" > -+#define GDB_TARGET_MIPS_ON_X86_64 "GDB_CONF_FLAGS=--target=mipsel-elf-linux" > - > - /* > - * 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 0185b5704..000000000 > --- a/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch > +++ /dev/null > @@ -1,79 +0,0 @@ > -Upstream-Status: Backport > - > -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=92fc615 > - > -Signed-off-by: Kai Kang <kai.kang@windriver.com> > --- > -From 92fc6153a6fdf2a027d9780f5945712aafad4a9e Mon Sep 17 00:00:00 2001 > -From: Mike Frysinger <vapier@gentoo.org> > -Date: Sun, 29 Mar 2015 15:59:01 -0400 > -Subject: [PATCH] sim: common: sim-arange: fix extern inline handling > - > -With newer versions of gcc (5.x), the extern inline we're using with the > -sim-arange module no longer works. Since this code really wants the gnu > -inline semantics, use that attribute explicitly. > - > -Reported-by: DJ Delorie <dj@redhat.com> > -Reported-by: Joel Sherrill <joel.sherrill@oarcorp.com> > ---- > - gdb-7.6/sim/common/sim-arange.h | 20 ++++++++++++-------- > - gdb-7.6/sim/common/sim-inline.h | 4 +++- > - 2 files changed, 15 insertions(+), 9 deletions(-) > - > -diff --git a/gdb-7.6/sim/common/sim-arange.h b/gdb-7.6/sim/common/sim-arange.h > -index 73117f3..de842c9 100644 > ---- a/gdb-7.6/sim/common/sim-arange.h > -+++ b/gdb-7.6/sim/common/sim-arange.h > -@@ -60,22 +60,26 @@ extern void sim_addr_range_delete (ADDR_RANGE * /*ar*/, > - address_word /*start*/, > - address_word /*end*/); > - > -+/* TODO: This should get moved into sim-inline.h. */ > -+#ifdef HAVE_INLINE > -+#ifdef SIM_ARANGE_C > -+#define SIM_ARANGE_INLINE INLINE > -+#else > -+#define SIM_ARANGE_INLINE EXTERN_INLINE > -+#endif > -+#else > -+#define SIM_ARANGE_INLINE EXTERN > -+#endif > -+ > - /* Return non-zero if ADDR is in range AR, traversing the entire tree. > - If no range is specified, that is defined to mean "everything". */ > --extern INLINE int > -+SIM_ARANGE_INLINE int > - sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/); > - #define ADDR_RANGE_HIT_P(ar, addr) \ > - ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr))) > - > - #ifdef HAVE_INLINE > --#ifdef SIM_ARANGE_C > --#define SIM_ARANGE_INLINE INLINE > --#else > --#define SIM_ARANGE_INLINE EXTERN_INLINE > --#endif > - #include "sim-arange.c" > --#else > --#define SIM_ARANGE_INLINE > - #endif > - #define SIM_ARANGE_C_INCLUDED > - > -diff --git a/gdb-7.6/sim/common/sim-inline.h b/gdb-7.6/sim/common/sim-inline.h > -index af75562..8a9c286 100644 > ---- a/gdb-7.6/sim/common/sim-inline.h > -+++ b/gdb-7.6/sim/common/sim-inline.h > -@@ -303,7 +303,9 @@ > - /* ??? Temporary, pending decision to always use extern inline and do a vast > - cleanup of inline support. */ > - #ifndef INLINE2 > --#if defined (__GNUC__) > -+#if defined (__GNUC_GNU_INLINE__) || defined (__GNUC_STDC_INLINE__) > -+#define INLINE2 __inline__ __attribute__ ((__gnu_inline__)) > -+#elif defined (__GNUC__) > - #define INLINE2 __inline__ > - #else > - #define INLINE2 /*inline*/ > --- > -2.6.1 > - > 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 77a287f14..000000000 > --- a/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -Upstream-Status: Backport > - > -https://sourceware.org/git/?p=binutils-gdb.git;h=0d8a6ab > - > -Signed-off-by: Kai Kang <kai.kang@windriver.com> > ---- > -From 0d8a6ab7d39d28fb1557e2a62e9e4b336341ab34 Mon Sep 17 00:00:00 2001 > -From: Aaro Koskinen <aaro.koskinen@iki.fi> > -Date: Mon, 17 Feb 2014 17:12:59 -0500 > -Subject: [PATCH] sim: ppc: drop $(LIBS) from psim dependency > - > -When cross-compiling GDB for PPC, there's a prerequisite "-lz" for psim > -that results in a build failure. With such prerequisite, GNU Make will > -try to search the library from build machine's /usr/lib which is wrong. > -On 64-bit Linux build machines the compilation will fail because of this. > - > -URL: https://sourceware.org/bugzilla/show_bug.cgi?id=12202 > ---- > - sim/ppc/Makefile.in | 2 +- > - 1 files changed, 1 insertions(+), 1 deletions(-) > - > -diff --git a/gdb-7.6/sim/ppc/Makefile.in b/gdb-7.6/sim/ppc/Makefile.in > -index b811f6f..740bdb0 100644 > ---- a/gdb-7.6/sim/ppc/Makefile.in > -+++ b/gdb-7.6/sim/ppc/Makefile.in > -@@ -552,7 +552,7 @@ PACKAGE_SRC = @sim_pk_src@ > - PACKAGE_OBJ = @sim_pk_obj@ > - > - > --psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(LIBINTL_DEP) > -+psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) > - $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) > - > - run: psim > --- > -1.9.4 > - > diff --git a/meta-oe/recipes-kernel/crash/crash_7.3.0.bb b/meta-oe/recipes-kernel/crash/crash_8.0.0.bb > similarity index 87% > rename from meta-oe/recipes-kernel/crash/crash_7.3.0.bb > rename to meta-oe/recipes-kernel/crash/crash_8.0.0.bb > index d4aa0d52b..4ea5b67de 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" > > S = "${WORKDIR}/git" > SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=https \ > - ${GNU_MIRROR}/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ > + ${GNU_MIRROR}/gdb/gdb-10.2.tar.gz;name=gdb;subdir=git \ > file://7001force_define_architecture.patch \ > file://7003cross_ranlib.patch \ > file://0001-cross_add_configure_option.patch \ > - file://sim-ppc-drop-LIBS-from-psim-dependency.patch \ > - file://sim-common-sim-arange-fix-extern-inline-handling.patch \ > file://donnot-extract-gdb-during-do-compile.patch \ > file://gdb_build_jobs_and_not_write_crash_target.patch \ > - file://remove-unrecognized-gcc-option-m32-for-mips.patch \ > - file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ > - file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ > " > -SRCREV = "2a3e546942ab560f050ab77e8c7828b06513b3f0" > +SRCREV = "ec568e2ea515b66343d3488d5d4b9a625d55b7ae" > > -SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" > -SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" > +SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350" > > UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases" > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#96730): https://lists.openembedded.org/g/openembedded-devel/message/96730 > Mute This Topic: https://lists.openembedded.org/mt/90620887/3616698 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [akuster808@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 4/26/22 7:31 AM, akuster808 wrote: > [Please note: This e-mail is from an EXTERNAL e-mail address] > > On 4/21/22 20:07, Yu, Mingli wrote: >> From: Mingli Yu <mingli.yu@windriver.com> >> >> The bundled gdb upgraded to 10.2 [1] and remove related patches >> against the previous gdb 7.6. > > Do we need to be in-sync with the GDB in core? Yes, there is also some changes related to gdb in release note as https://github.com/crash-utility/crash/commit/ec568e2ea515b66343d3488d5d4b9a625d55b7ae Thanks, > > - armin >> >> [1] >> https://github.com/crash-utility/crash/commit/ec568e2ea515b66343d3488d5d4b9a625d55b7ae >> >> >> Signed-off-by: Mingli Yu <mingli.yu@windriver.com> >> --- >> ...error-unknown-type-name-gdb_fpregset.patch | 36 --------- >> ...tect-the-sysroot-s-glibc-header-file.patch | 33 -------- >> ...unrecognized-gcc-option-m32-for-mips.patch | 33 -------- >> ...im-arange-fix-extern-inline-handling.patch | 79 ------------------- >> ...m-ppc-drop-LIBS-from-psim-dependency.patch | 37 --------- >> .../crash/{crash_7.3.0.bb => crash_8.0.0.bb} | 12 +-- >> 6 files changed, 3 insertions(+), 227 deletions(-) >> delete mode 100644 >> meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch >> >> delete mode 100644 >> meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch >> >> delete mode 100644 >> meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch >> >> delete mode 100644 >> meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch >> >> delete mode 100644 >> meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch >> >> rename meta-oe/recipes-kernel/crash/{crash_7.3.0.bb => >> crash_8.0.0.bb} (87%) >> >> 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 8355fe44e..000000000 >> --- >> a/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch >> >> +++ /dev/null >> @@ -1,36 +0,0 @@ >> -From 52fc1a7c17768fd52c3577d21dad84e8babb94b5 Mon Sep 17 00:00:00 2001 >> -From: Dengke Du <dengke.du@windriver.com> >> -Date: Thu, 6 Apr 2017 23:01:14 -0400 >> -Subject: [PATCH 2/3] crash: fix build error unknown type name >> 'gdb_fpregset_t' >> - >> -Upstream-Status: Pending >> - >> -Signed-off-by: Dengke Du <dengke.du@windriver.com> >> ---- >> - gdb-7.6/gdb/gdb_proc_service.h | 3 +-- >> - 1 file changed, 1 insertion(+), 2 deletions(-) >> - >> -diff --git a/gdb-7.6/gdb/gdb_proc_service.h >> b/gdb-7.6/gdb/gdb_proc_service.h >> -index 8bc6088..99c6496 100644 >> ---- a/gdb-7.6/gdb/gdb_proc_service.h >> -+++ b/gdb-7.6/gdb/gdb_proc_service.h >> -@@ -20,6 +20,7 @@ >> - #define GDB_PROC_SERVICE_H >> - >> - #include <sys/types.h> >> -+#include "gregset.h" >> - >> - #ifdef HAVE_PROC_SERVICE_H >> - #include <proc_service.h> >> -@@ -53,8 +54,6 @@ >> - #include <sys/procfs.h> >> - #endif >> - >> --#include "gregset.h" >> -- >> - /* Functions in this interface return one of these status codes. */ >> - typedef enum >> - { >> --- >> -2.8.1 >> - >> 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 1f4bd01da..000000000 >> --- >> a/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch >> >> +++ /dev/null >> @@ -1,33 +0,0 @@ >> -From c7950ef5228adc52a500b4fc67d7e48c3c09c1df Mon Sep 17 00:00:00 2001 >> -From: Dengke Du <dengke.du@windriver.com> >> -Date: Thu, 6 Apr 2017 23:02:44 -0400 >> -Subject: [PATCH 3/3] crash: detect the sysroot's glibc header file >> - >> -This is cross compile, so let the Makefile detect the sysroot's glibc >> -header file, not the host's glibc header file. >> - >> -Upstream-Status: Pending >> - >> -Signed-off-by: Dengke Du <dengke.du@windriver.com> >> ---- >> - Makefile | 4 ++-- >> - 1 file changed, 2 insertions(+), 2 deletions(-) >> - >> -diff --git a/Makefile b/Makefile >> -index b6b7e80..94f21a5 100644 >> ---- a/Makefile >> -+++ b/Makefile >> -@@ -264,8 +264,8 @@ gdb_patch: >> - if [ "${ARCH}" = "x86_64" ] && [ "${TARGET}" = "PPC64" ] && [ -f >> ${GDB}-ppc64le-support.patch ]; then \ >> - patch -d ${GDB} -p1 -F0 < ${GDB}-ppc64le-support.patch ; \ >> - fi >> -- if [ -f /usr/include/proc_service.h ]; then \ >> -- grep 'extern ps_err_e ps_get_thread_area (struct' >> /usr/include/proc_service.h; \ >> -+ if [ -f ${RECIPE_SYSROOT}/usr/include/proc_service.h ]; then \ >> -+ grep 'extern ps_err_e ps_get_thread_area (struct' >> ${RECIPE_SYSROOT}/usr/include/proc_service.h; \ >> - if [ $$? -eq 0 ]; then \ >> - patch -p0 < ${GDB}-proc_service.h.patch; \ >> - fi; \ >> --- >> -2.8.1 >> - >> 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 37d43b888..000000000 >> --- >> a/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch >> >> +++ /dev/null >> @@ -1,33 +0,0 @@ >> -Upstream-Status: Pending >> - >> -It fails to build crash for mips with error: >> - >> -| mips-wrs-linux-gcc: error: unrecognized command line option '-m32' >> -| Makefile:291: recipe for target 'make_build_data' failed >> - >> -So remove the unrecognized option '-m32' for mips. >> - >> -Signed-off-by: Kai Kang <kai.kang@windriver.com> >> ---- >> -diff --git a/configure.c b/configure.c >> -index cf1973b..71e97b3 100644 >> ---- a/configure.c >> -+++ b/configure.c >> -@@ -155,7 +155,7 @@ void add_extra_lib(char *); >> - #define TARGET_CFLAGS_PPC64_ON_X86_64 "TARGET_CFLAGS=" >> - #define TARGET_CFLAGS_MIPS >> "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" >> - #define TARGET_CFLAGS_MIPS_ON_X86 >> "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" >> --#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-m32 >> -D_FILE_OFFSET_BITS=64" >> -+#define TARGET_CFLAGS_MIPS_ON_X86_64 >> "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" >> - #define TARGET_CFLAGS_MIPS64 "TARGET_CFLAGS=" >> - #define TARGET_CFLAGS_SPARC64 "TARGET_CFLAGS=" >> - >> -@@ -167,7 +167,7 @@ void add_extra_lib(char *); >> - #define GDB_TARGET_ARM64_ON_X86_64 >> "GDB_CONF_FLAGS=--target=aarch64-elf-linux" /* TBD */ >> - #define GDB_TARGET_PPC64_ON_X86_64 >> "GDB_CONF_FLAGS=--target=powerpc64le-unknown-linux-gnu" >> - #define GDB_TARGET_MIPS_ON_X86 >> "GDB_CONF_FLAGS=--target=mipsel-elf-linux" >> --#define GDB_TARGET_MIPS_ON_X86_64 >> "GDB_CONF_FLAGS=--target=mipsel-elf-linux CFLAGS=-m32" >> -+#define GDB_TARGET_MIPS_ON_X86_64 >> "GDB_CONF_FLAGS=--target=mipsel-elf-linux" >> - >> - /* >> - * 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 0185b5704..000000000 >> --- >> a/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch >> >> +++ /dev/null >> @@ -1,79 +0,0 @@ >> -Upstream-Status: Backport >> - >> -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=92fc615 >> - >> -Signed-off-by: Kai Kang <kai.kang@windriver.com> >> --- >> -From 92fc6153a6fdf2a027d9780f5945712aafad4a9e Mon Sep 17 00:00:00 2001 >> -From: Mike Frysinger <vapier@gentoo.org> >> -Date: Sun, 29 Mar 2015 15:59:01 -0400 >> -Subject: [PATCH] sim: common: sim-arange: fix extern inline handling >> - >> -With newer versions of gcc (5.x), the extern inline we're using with the >> -sim-arange module no longer works. Since this code really wants the gnu >> -inline semantics, use that attribute explicitly. >> - >> -Reported-by: DJ Delorie <dj@redhat.com> >> -Reported-by: Joel Sherrill <joel.sherrill@oarcorp.com> >> ---- >> - gdb-7.6/sim/common/sim-arange.h | 20 ++++++++++++-------- >> - gdb-7.6/sim/common/sim-inline.h | 4 +++- >> - 2 files changed, 15 insertions(+), 9 deletions(-) >> - >> -diff --git a/gdb-7.6/sim/common/sim-arange.h >> b/gdb-7.6/sim/common/sim-arange.h >> -index 73117f3..de842c9 100644 >> ---- a/gdb-7.6/sim/common/sim-arange.h >> -+++ b/gdb-7.6/sim/common/sim-arange.h >> -@@ -60,22 +60,26 @@ extern void sim_addr_range_delete (ADDR_RANGE * >> /*ar*/, >> - address_word /*start*/, >> - address_word /*end*/); >> - >> -+/* TODO: This should get moved into sim-inline.h. */ >> -+#ifdef HAVE_INLINE >> -+#ifdef SIM_ARANGE_C >> -+#define SIM_ARANGE_INLINE INLINE >> -+#else >> -+#define SIM_ARANGE_INLINE EXTERN_INLINE >> -+#endif >> -+#else >> -+#define SIM_ARANGE_INLINE EXTERN >> -+#endif >> -+ >> - /* Return non-zero if ADDR is in range AR, traversing the entire tree. >> - If no range is specified, that is defined to mean "everything". */ >> --extern INLINE int >> -+SIM_ARANGE_INLINE int >> - sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/); >> - #define ADDR_RANGE_HIT_P(ar, addr) \ >> - ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr))) >> - >> - #ifdef HAVE_INLINE >> --#ifdef SIM_ARANGE_C >> --#define SIM_ARANGE_INLINE INLINE >> --#else >> --#define SIM_ARANGE_INLINE EXTERN_INLINE >> --#endif >> - #include "sim-arange.c" >> --#else >> --#define SIM_ARANGE_INLINE >> - #endif >> - #define SIM_ARANGE_C_INCLUDED >> - >> -diff --git a/gdb-7.6/sim/common/sim-inline.h >> b/gdb-7.6/sim/common/sim-inline.h >> -index af75562..8a9c286 100644 >> ---- a/gdb-7.6/sim/common/sim-inline.h >> -+++ b/gdb-7.6/sim/common/sim-inline.h >> -@@ -303,7 +303,9 @@ >> - /* ??? Temporary, pending decision to always use extern inline and >> do a vast >> - cleanup of inline support. */ >> - #ifndef INLINE2 >> --#if defined (__GNUC__) >> -+#if defined (__GNUC_GNU_INLINE__) || defined (__GNUC_STDC_INLINE__) >> -+#define INLINE2 __inline__ __attribute__ ((__gnu_inline__)) >> -+#elif defined (__GNUC__) >> - #define INLINE2 __inline__ >> - #else >> - #define INLINE2 /*inline*/ >> --- >> -2.6.1 >> - >> 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 77a287f14..000000000 >> --- >> a/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch >> >> +++ /dev/null >> @@ -1,37 +0,0 @@ >> -Upstream-Status: Backport >> - >> -https://sourceware.org/git/?p=binutils-gdb.git;h=0d8a6ab >> - >> -Signed-off-by: Kai Kang <kai.kang@windriver.com> >> ---- >> -From 0d8a6ab7d39d28fb1557e2a62e9e4b336341ab34 Mon Sep 17 00:00:00 2001 >> -From: Aaro Koskinen <aaro.koskinen@iki.fi> >> -Date: Mon, 17 Feb 2014 17:12:59 -0500 >> -Subject: [PATCH] sim: ppc: drop $(LIBS) from psim dependency >> - >> -When cross-compiling GDB for PPC, there's a prerequisite "-lz" for psim >> -that results in a build failure. With such prerequisite, GNU Make will >> -try to search the library from build machine's /usr/lib which is wrong. >> -On 64-bit Linux build machines the compilation will fail because of >> this. >> - >> -URL: https://sourceware.org/bugzilla/show_bug.cgi?id=12202 >> ---- >> - sim/ppc/Makefile.in | 2 +- >> - 1 files changed, 1 insertions(+), 1 deletions(-) >> - >> -diff --git a/gdb-7.6/sim/ppc/Makefile.in b/gdb-7.6/sim/ppc/Makefile.in >> -index b811f6f..740bdb0 100644 >> ---- a/gdb-7.6/sim/ppc/Makefile.in >> -+++ b/gdb-7.6/sim/ppc/Makefile.in >> -@@ -552,7 +552,7 @@ PACKAGE_SRC = @sim_pk_src@ >> - PACKAGE_OBJ = @sim_pk_obj@ >> - >> - >> --psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) >> $(LIBINTL_DEP) >> -+psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) >> - $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o >> $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) >> - >> - run: psim >> --- >> -1.9.4 >> - >> diff --git a/meta-oe/recipes-kernel/crash/crash_7.3.0.bb >> b/meta-oe/recipes-kernel/crash/crash_8.0.0.bb >> similarity index 87% >> rename from meta-oe/recipes-kernel/crash/crash_7.3.0.bb >> rename to meta-oe/recipes-kernel/crash/crash_8.0.0.bb >> index d4aa0d52b..4ea5b67de 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" >> >> S = "${WORKDIR}/git" >> SRC_URI = >> "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=https \ >> - ${GNU_MIRROR}/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ >> + ${GNU_MIRROR}/gdb/gdb-10.2.tar.gz;name=gdb;subdir=git \ >> file://7001force_define_architecture.patch \ >> file://7003cross_ranlib.patch \ >> file://0001-cross_add_configure_option.patch \ >> - file://sim-ppc-drop-LIBS-from-psim-dependency.patch \ >> - >> file://sim-common-sim-arange-fix-extern-inline-handling.patch \ >> file://donnot-extract-gdb-during-do-compile.patch \ >> file://gdb_build_jobs_and_not_write_crash_target.patch \ >> - file://remove-unrecognized-gcc-option-m32-for-mips.patch \ >> - >> file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ >> - >> file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ >> " >> -SRCREV = "2a3e546942ab560f050ab77e8c7828b06513b3f0" >> +SRCREV = "ec568e2ea515b66343d3488d5d4b9a625d55b7ae" >> >> -SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" >> -SRC_URI[gdb.sha256sum] = >> "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" >> +SRC_URI[gdb.sha256sum] = >> "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350" >> >> UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases" >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#96730): >> https://lists.openembedded.org/g/openembedded-devel/message/96730 >> Mute This Topic: https://lists.openembedded.org/mt/90620887/3616698 >> Group Owner: openembedded-devel+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub >> [akuster808@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >> >
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 8355fe44e..000000000 --- a/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 52fc1a7c17768fd52c3577d21dad84e8babb94b5 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Thu, 6 Apr 2017 23:01:14 -0400 -Subject: [PATCH 2/3] crash: fix build error unknown type name 'gdb_fpregset_t' - -Upstream-Status: Pending - -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - gdb-7.6/gdb/gdb_proc_service.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/gdb-7.6/gdb/gdb_proc_service.h b/gdb-7.6/gdb/gdb_proc_service.h -index 8bc6088..99c6496 100644 ---- a/gdb-7.6/gdb/gdb_proc_service.h -+++ b/gdb-7.6/gdb/gdb_proc_service.h -@@ -20,6 +20,7 @@ - #define GDB_PROC_SERVICE_H - - #include <sys/types.h> -+#include "gregset.h" - - #ifdef HAVE_PROC_SERVICE_H - #include <proc_service.h> -@@ -53,8 +54,6 @@ - #include <sys/procfs.h> - #endif - --#include "gregset.h" -- - /* Functions in this interface return one of these status codes. */ - typedef enum - { --- -2.8.1 - 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 1f4bd01da..000000000 --- a/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c7950ef5228adc52a500b4fc67d7e48c3c09c1df Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Thu, 6 Apr 2017 23:02:44 -0400 -Subject: [PATCH 3/3] crash: detect the sysroot's glibc header file - -This is cross compile, so let the Makefile detect the sysroot's glibc -header file, not the host's glibc header file. - -Upstream-Status: Pending - -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index b6b7e80..94f21a5 100644 ---- a/Makefile -+++ b/Makefile -@@ -264,8 +264,8 @@ gdb_patch: - if [ "${ARCH}" = "x86_64" ] && [ "${TARGET}" = "PPC64" ] && [ -f ${GDB}-ppc64le-support.patch ]; then \ - patch -d ${GDB} -p1 -F0 < ${GDB}-ppc64le-support.patch ; \ - fi -- if [ -f /usr/include/proc_service.h ]; then \ -- grep 'extern ps_err_e ps_get_thread_area (struct' /usr/include/proc_service.h; \ -+ if [ -f ${RECIPE_SYSROOT}/usr/include/proc_service.h ]; then \ -+ grep 'extern ps_err_e ps_get_thread_area (struct' ${RECIPE_SYSROOT}/usr/include/proc_service.h; \ - if [ $$? -eq 0 ]; then \ - patch -p0 < ${GDB}-proc_service.h.patch; \ - fi; \ --- -2.8.1 - 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 37d43b888..000000000 --- a/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Pending - -It fails to build crash for mips with error: - -| mips-wrs-linux-gcc: error: unrecognized command line option '-m32' -| Makefile:291: recipe for target 'make_build_data' failed - -So remove the unrecognized option '-m32' for mips. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -diff --git a/configure.c b/configure.c -index cf1973b..71e97b3 100644 ---- a/configure.c -+++ b/configure.c -@@ -155,7 +155,7 @@ void add_extra_lib(char *); - #define TARGET_CFLAGS_PPC64_ON_X86_64 "TARGET_CFLAGS=" - #define TARGET_CFLAGS_MIPS "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" - #define TARGET_CFLAGS_MIPS_ON_X86 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" --#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-m32 -D_FILE_OFFSET_BITS=64" -+#define TARGET_CFLAGS_MIPS_ON_X86_64 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64" - #define TARGET_CFLAGS_MIPS64 "TARGET_CFLAGS=" - #define TARGET_CFLAGS_SPARC64 "TARGET_CFLAGS=" - -@@ -167,7 +167,7 @@ void add_extra_lib(char *); - #define GDB_TARGET_ARM64_ON_X86_64 "GDB_CONF_FLAGS=--target=aarch64-elf-linux" /* TBD */ - #define GDB_TARGET_PPC64_ON_X86_64 "GDB_CONF_FLAGS=--target=powerpc64le-unknown-linux-gnu" - #define GDB_TARGET_MIPS_ON_X86 "GDB_CONF_FLAGS=--target=mipsel-elf-linux" --#define GDB_TARGET_MIPS_ON_X86_64 "GDB_CONF_FLAGS=--target=mipsel-elf-linux CFLAGS=-m32" -+#define GDB_TARGET_MIPS_ON_X86_64 "GDB_CONF_FLAGS=--target=mipsel-elf-linux" - - /* - * 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 0185b5704..000000000 --- a/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch +++ /dev/null @@ -1,79 +0,0 @@ -Upstream-Status: Backport - -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=92fc615 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> --- -From 92fc6153a6fdf2a027d9780f5945712aafad4a9e Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 29 Mar 2015 15:59:01 -0400 -Subject: [PATCH] sim: common: sim-arange: fix extern inline handling - -With newer versions of gcc (5.x), the extern inline we're using with the -sim-arange module no longer works. Since this code really wants the gnu -inline semantics, use that attribute explicitly. - -Reported-by: DJ Delorie <dj@redhat.com> -Reported-by: Joel Sherrill <joel.sherrill@oarcorp.com> ---- - gdb-7.6/sim/common/sim-arange.h | 20 ++++++++++++-------- - gdb-7.6/sim/common/sim-inline.h | 4 +++- - 2 files changed, 15 insertions(+), 9 deletions(-) - -diff --git a/gdb-7.6/sim/common/sim-arange.h b/gdb-7.6/sim/common/sim-arange.h -index 73117f3..de842c9 100644 ---- a/gdb-7.6/sim/common/sim-arange.h -+++ b/gdb-7.6/sim/common/sim-arange.h -@@ -60,22 +60,26 @@ extern void sim_addr_range_delete (ADDR_RANGE * /*ar*/, - address_word /*start*/, - address_word /*end*/); - -+/* TODO: This should get moved into sim-inline.h. */ -+#ifdef HAVE_INLINE -+#ifdef SIM_ARANGE_C -+#define SIM_ARANGE_INLINE INLINE -+#else -+#define SIM_ARANGE_INLINE EXTERN_INLINE -+#endif -+#else -+#define SIM_ARANGE_INLINE EXTERN -+#endif -+ - /* Return non-zero if ADDR is in range AR, traversing the entire tree. - If no range is specified, that is defined to mean "everything". */ --extern INLINE int -+SIM_ARANGE_INLINE int - sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/); - #define ADDR_RANGE_HIT_P(ar, addr) \ - ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr))) - - #ifdef HAVE_INLINE --#ifdef SIM_ARANGE_C --#define SIM_ARANGE_INLINE INLINE --#else --#define SIM_ARANGE_INLINE EXTERN_INLINE --#endif - #include "sim-arange.c" --#else --#define SIM_ARANGE_INLINE - #endif - #define SIM_ARANGE_C_INCLUDED - -diff --git a/gdb-7.6/sim/common/sim-inline.h b/gdb-7.6/sim/common/sim-inline.h -index af75562..8a9c286 100644 ---- a/gdb-7.6/sim/common/sim-inline.h -+++ b/gdb-7.6/sim/common/sim-inline.h -@@ -303,7 +303,9 @@ - /* ??? Temporary, pending decision to always use extern inline and do a vast - cleanup of inline support. */ - #ifndef INLINE2 --#if defined (__GNUC__) -+#if defined (__GNUC_GNU_INLINE__) || defined (__GNUC_STDC_INLINE__) -+#define INLINE2 __inline__ __attribute__ ((__gnu_inline__)) -+#elif defined (__GNUC__) - #define INLINE2 __inline__ - #else - #define INLINE2 /*inline*/ --- -2.6.1 - 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 77a287f14..000000000 --- a/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Backport - -https://sourceware.org/git/?p=binutils-gdb.git;h=0d8a6ab - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From 0d8a6ab7d39d28fb1557e2a62e9e4b336341ab34 Mon Sep 17 00:00:00 2001 -From: Aaro Koskinen <aaro.koskinen@iki.fi> -Date: Mon, 17 Feb 2014 17:12:59 -0500 -Subject: [PATCH] sim: ppc: drop $(LIBS) from psim dependency - -When cross-compiling GDB for PPC, there's a prerequisite "-lz" for psim -that results in a build failure. With such prerequisite, GNU Make will -try to search the library from build machine's /usr/lib which is wrong. -On 64-bit Linux build machines the compilation will fail because of this. - -URL: https://sourceware.org/bugzilla/show_bug.cgi?id=12202 ---- - sim/ppc/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/gdb-7.6/sim/ppc/Makefile.in b/gdb-7.6/sim/ppc/Makefile.in -index b811f6f..740bdb0 100644 ---- a/gdb-7.6/sim/ppc/Makefile.in -+++ b/gdb-7.6/sim/ppc/Makefile.in -@@ -552,7 +552,7 @@ PACKAGE_SRC = @sim_pk_src@ - PACKAGE_OBJ = @sim_pk_obj@ - - --psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(LIBINTL_DEP) -+psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) - $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) - - run: psim --- -1.9.4 - diff --git a/meta-oe/recipes-kernel/crash/crash_7.3.0.bb b/meta-oe/recipes-kernel/crash/crash_8.0.0.bb similarity index 87% rename from meta-oe/recipes-kernel/crash/crash_7.3.0.bb rename to meta-oe/recipes-kernel/crash/crash_8.0.0.bb index d4aa0d52b..4ea5b67de 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" S = "${WORKDIR}/git" SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=https \ - ${GNU_MIRROR}/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ + ${GNU_MIRROR}/gdb/gdb-10.2.tar.gz;name=gdb;subdir=git \ file://7001force_define_architecture.patch \ file://7003cross_ranlib.patch \ file://0001-cross_add_configure_option.patch \ - file://sim-ppc-drop-LIBS-from-psim-dependency.patch \ - file://sim-common-sim-arange-fix-extern-inline-handling.patch \ file://donnot-extract-gdb-during-do-compile.patch \ file://gdb_build_jobs_and_not_write_crash_target.patch \ - file://remove-unrecognized-gcc-option-m32-for-mips.patch \ - file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ - file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ " -SRCREV = "2a3e546942ab560f050ab77e8c7828b06513b3f0" +SRCREV = "ec568e2ea515b66343d3488d5d4b9a625d55b7ae" -SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" -SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" +SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350" UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases"