diff options
Diffstat (limited to 'meta/recipes-devtools/gdb')
21 files changed, 177 insertions, 1295 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f3ce..0000000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-gdbserver-ctrl-c-handling.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://0011-Fix-invalid-sigprocmask-call.patch \ - file://CVE-2019-1010180.patch \ - " -SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" -SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc index 08f615addf..ea1fc27a61 100644 --- a/meta/recipes-devtools/gdb/gdb-common.inc +++ b/meta/recipes-devtools/gdb/gdb-common.inc @@ -1,13 +1,14 @@ SUMMARY = "GNU debugger" HOMEPAGE = "http://www.gnu.org/software/gdb/" +DESCRIPTION = "GDB, the GNU Project debugger, allows you to see what is going on inside another program while it executes -- or what another program was doing at the moment it crashed." SECTION = "devel" -DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" +DEPENDS = "expat gmp mpfr zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" LTTNGUST = "lttng-ust" -LTTNGUST_arc = "" -LTTNGUST_aarch64 = "" -LTTNGUST_mipsarch = "" -LTTNGUST_sh4 = "" +LTTNGUST:arc = "" +LTTNGUST:aarch64 = "" +LTTNGUST:mipsarch = "" +LTTNGUST:sh4 = "" inherit autotools texinfo @@ -15,31 +16,35 @@ UPSTREAM_CHECK_GITTAGREGEX = "gdb\-(?P<pver>.+)\-release" B = "${WORKDIR}/build-${TARGET_SYS}" -EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" - EXPAT = "--with-expat --with-libexpat-prefix=${STAGING_DIR_HOST}" EXTRA_OECONF = "--disable-gdbtk --disable-x --disable-werror \ --with-curses --disable-multilib --disable-sim \ - --without-lzma --without-guile \ + --without-guile \ ${GDBPROPREFIX} ${EXPAT} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \ --disable-rpath \ --disable-gas --disable-binutils \ --disable-ld --disable-gold \ --disable-gprof \ + --with-libgmp-prefix=${STAGING_EXECPREFIXDIR} \ " -PACKAGECONFIG ??= "readline" +PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)} python \ + ${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'xz', '', d)} \ + " # Use --without-system-readline to compile with readline 5. PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline" -PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3 python3-codecs" +PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3-codecs" PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" -# ncurses is already a hard DEPENDS, but would be added here if it weren't -PACKAGECONFIG[tui] = "--enable-tui,--disable-tui" +PACKAGECONFIG[tui] = "--enable-tui,--disable-tui,,ncurses-terminfo-base" +PACKAGECONFIG[xz] = "--with-lzma --with-liblzma-prefix=${STAGING_DIR_HOST},--without-lzma,xz" +PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils" GDBPROPREFIX = "--program-prefix=''" +DISABLE_STATIC = "" + do_configure () { # override this function to avoid the autoconf/automake/aclocal/autoheader # calls for now @@ -49,14 +54,15 @@ do_configure () { # we don't want gdb to provide bfd/iberty/opcodes, which instead will override the # right bits installed by binutils. Same for bfd.info -- also from binutils. -do_install_append() { +do_install:append() { rm -rf ${D}${libdir} rm -rf ${D}${includedir} rm -rf ${D}${datadir}/locale rm -f ${D}${infodir}/bfd.info + rm -f ${D}${infodir}/sframe-spec.info } -RRECOMMENDS_gdb_append_linux = " glibc-thread-db " -RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " -RRECOMMENDS_gdbserver_append_linux = " glibc-thread-db " -RRECOMMENDS_gdbserver_append_linux-gnueabi = " glibc-thread-db " +RRECOMMENDS:gdb:append:linux = " glibc-thread-db " +RRECOMMENDS:gdb:append:linux-gnueabi = " glibc-thread-db " +RRECOMMENDS:gdbserver:append:linux = " glibc-thread-db " +RRECOMMENDS:gdbserver:append:linux-gnueabi = " glibc-thread-db " diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index c9daf25a41..058ffbc9c5 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc @@ -1,26 +1,28 @@ inherit cross-canadian inherit python3-dir +inherit pkgconfig SUMMARY = "GNU debugger (cross-canadian gdb for ${TARGET_ARCH} target)" PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "gdb" -DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext \ - virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-libc" +DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-gmp nativesdk-mpfr \ + virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc" GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" # Overrides PACKAGECONFIG variables in gdb-common.inc -PACKAGECONFIG ??= "python readline" +PACKAGECONFIG ??= "python readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \ nativesdk-python3-core \ nativesdk-python3-codecs nativesdk-python3-netclient \ " PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline" +PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, nativesdk-elfutils" -SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" +SSTATE_ALLOW_OVERLAP_FILES += "${STAGING_DATADIR}/gdb" -do_configure_prepend() { +do_configure:prepend() { cat > ${WORKDIR}/python << EOF #! /bin/sh case "\$2" in @@ -36,7 +38,7 @@ EOF # we don't want gdb to provide bfd/iberty/opcodes, which instead will override the # right bits installed by binutils. -do_install_append() { +do_install:append() { rm -rf ${D}${exec_prefix}/lib cross_canadian_bindirlinks } diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_14.2.bb index 301035940c..4ab2b7156d 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_14.2.bb @@ -1,3 +1,3 @@ require gdb-common.inc require gdb-cross-canadian.inc -require gdb-${PV}.inc +require gdb.inc diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc b/meta/recipes-devtools/gdb/gdb-cross.inc index ebe329f6d3..399f4bba97 100644 --- a/meta/recipes-devtools/gdb/gdb-cross.inc +++ b/meta/recipes-devtools/gdb/gdb-cross.inc @@ -1,15 +1,16 @@ require gdb-common.inc -DEPENDS = "expat-native ncurses-native flex-native bison-native" +DEPENDS = "expat-native gmp-native mpfr-native ncurses-native flex-native bison-native" -inherit python3native +inherit python3native pkgconfig # Overrides PACKAGECONFIG variables in gdb-common.inc -PACKAGECONFIG ??= "python readline" +PACKAGECONFIG ??= "python readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-native" PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native" +PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils-native" -do_compile_prepend() { +do_compile:prepend() { export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}" export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}" } diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_14.2.bb index 50cf159fdb..3b654a2f0d 100644 --- a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb +++ b/meta/recipes-devtools/gdb/gdb-cross_14.2.bb @@ -1,2 +1,2 @@ require gdb-cross.inc -require gdb-${PV}.inc +require gdb.inc diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 249e24dc52..81ac441462 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc @@ -1,14 +1,17 @@ -require gdb-common.inc - -inherit gettext - -#LDFLAGS_append = " -s" -#export CFLAGS_append=" -L${STAGING_LIBDIR}" - -# cross-canadian must not see this -PACKAGES =+ "gdbserver" -FILES_gdbserver = "${bindir}/gdbserver" - -ALLOW_EMPTY_gdbserver_riscv64 = "1" -ALLOW_EMPTY_gdbserver_riscv32 = "1" +LICENSE = "GPL-2.0-only & GPL-3.0-only & LGPL-2.0-only & LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ + file://0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0003-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0004-use-asm-sgidefs.h.patch \ + file://0005-Change-order-of-CFLAGS.patch \ + file://0006-resolve-restrict-keyword-conflict.patch \ + file://0007-Fix-invalid-sigprocmask-call.patch \ + file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ + " +SRC_URI[sha256sum] = "2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772" diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index 71fe7f83b6..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,26 +0,0 @@ -This problem was created by the upstream commit 78708b7c8c -After applying the commit, it will send SIGINT to the process group(-signal_pid). -But if we use gdbserver send SIGINT, and the attached process is not a process -group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to -interrupt the attached process. - -Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] - -Author: Josh Gao -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> - -Index: gdb-8.2/gdb/gdbserver/linux-low.c -=================================================================== ---- gdb-8.2.orig/gdb/gdbserver/linux-low.c -+++ gdb-8.2/gdb/gdbserver/linux-low.c -@@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) - static void - linux_request_interrupt (void) - { -- /* Send a SIGINT to the process group. This acts just like the user -- typed a ^C on the controlling terminal. */ -- kill (-signal_pid, SIGINT); -+ kill (signal_pid, SIGINT); - } - - /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74c09..86f6e2642d 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -1,7 +1,7 @@ -From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 +From ff77aebf533758f0b6f7d22b272d32e08ed06e45 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined +Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined This helps building gdb on mips64 on musl, since musl does not provide sgidefs.h this define is @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 4 insertions(+) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 32835c16b2..68a7587af2 100644 +index 8a7cc95f2a4..bfd1c72cba6 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -41,6 +41,10 @@ @@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 class mips_linux_nat_target final : public linux_nat_trad_target { --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch deleted file mode 100644 index 60479e5410..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 02/11] make man install relative to DESTDIR - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - sim/common/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in -index 227e4cfbc2..8c3457e0bd 100644 ---- a/sim/common/Makefile.in -+++ b/sim/common/Makefile.in -@@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) - datarootdir = @datarootdir@ - datadir = @datadir@ - mandir = @mandir@ --man1dir = $(mandir)/man1 -+man1dir = $(DESTDIR)$(mandir)/man1 - infodir = @infodir@ - includedir = @includedir@ - --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512ef7..897cfd0df9 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 +From 78748dc55b1ceafe9a64beb9628f1d51b215482f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 30 Apr 2016 18:32:14 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -6,32 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> - --- - gdb/gdbserver/linux-ppc-low.c | 6 ++++++ - gdb/nat/ppc-linux.h | 6 ++++++ + gdb/nat/ppc-linux.h | 6 ++++++ + gdbserver/linux-ppc-low.cc | 6 ++++++ 2 files changed, 12 insertions(+) -diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53..1978347c 100644 ---- a/gdb/gdbserver/linux-ppc-low.c -+++ b/gdb/gdbserver/linux-ppc-low.c -@@ -23,7 +23,13 @@ - #include "elf/common.h" - #include <sys/uio.h> - #include <elf.h> -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include <asm/ptrace.h> -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - - #include "arch/ppc-linux-common.h" - #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b..40399361 100644 +index c84f9146bbd..8c8580c95e1 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ @@ -48,3 +29,21 @@ index f1561b3b..40399361 100644 #include <asm/cputable.h> /* This sometimes isn't defined. */ +diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc +index 86fbc8f5d96..8a1a39bc750 100644 +--- a/gdbserver/linux-ppc-low.cc ++++ b/gdbserver/linux-ppc-low.cc +@@ -23,7 +23,13 @@ + #include "elf/common.h" + #include <sys/uio.h> + #include <elf.h> ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include <asm/ptrace.h> ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + + #include "arch/ppc-linux-common.h" + #include "arch/ppc-linux-tdesc.h" diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0003-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee62be..e41be8209e 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -1,7 +1,7 @@ -From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 +From 683650564cd231bbf09c7cbc35543b77ca0b10d0 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static +Subject: [PATCH] Dont disable libreadline.a when using --disable-static If gdb is configured with --disable-static then this is dutifully passed to readline which then disables libreadline.a, which causes a problem when gdb @@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def -index 75063b6d12..c27bbe4d28 100644 +index 870150183b9..eb3788da0d2 100644 --- a/Makefile.def +++ b/Makefile.def -@@ -105,7 +105,8 @@ host_modules= { module= libiconv; +@@ -119,7 +119,8 @@ host_modules= { module= libiconv; missing= install-html; missing= install-info; }; host_modules= { module= m4; }; @@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 host_modules= { module= sim; }; host_modules= { module= texinfo; no_install= true; }; diff --git a/Makefile.in b/Makefile.in -index 7814fe745f..3b0dc7cbb0 100644 +index c97130a2338..a83f98e4778 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -25470,7 +25470,7 @@ configure-readline: +@@ -31691,7 +31691,7 @@ configure-readline: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ @@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 || exit 1 @endif readline --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch index 808f4bfa14..413610d71f 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 +From 04eba78ea6bd167b7eeef3af668c8f49888dc688 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <amccurdy@gmail.com> Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 07/11] use <asm/sgidefs.h> +Subject: [PATCH] use <asm/sgidefs.h> Build fix for MIPS with musl libc @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 68a7587af2..2b77221372 100644 +index bfd1c72cba6..13dc9cdb703 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 #include "nat/gdb_ptrace.h" #include <asm/ptrace.h> #include "inf-ptrace.h" --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch deleted file mode 100644 index f840cafe2e..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ /dev/null @@ -1,914 +0,0 @@ -From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 2 Mar 2015 02:31:12 +0000 -Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. - -gdb (7.4-1~cvs20111117.2) experimental; urgency=low - . - * Add Renesas SH (sh4) support (Closes: #576242) - - Thanks Nobuhiro Iwamatsu, Takashi Yoshii. -Author: Hector Oron <zumbi@debian.org> -Bug-Debian: http://bugs.debian.org/576242 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gdb/Makefile.in | 2 + - gdb/configure.host | 1 + - gdb/sh-linux-tdep.c | 519 +++++++++++++++++++++++++++ - gdb/sh-tdep.c | 53 ++- - gdb/sh-tdep.h | 49 +++ - gdb/testsuite/gdb.asm/asm-source.exp | 5 + - gdb/testsuite/gdb.asm/sh.inc | 3 +- - gdb/testsuite/gdb.base/annota1.c | 3 + - gdb/testsuite/gdb.base/annota3.c | 4 + - gdb/testsuite/gdb.base/sigall.c | 3 + - gdb/testsuite/gdb.base/signals.c | 4 + - 11 files changed, 617 insertions(+), 29 deletions(-) - -diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index c76a4e4394..921fdadb49 100644 ---- a/gdb/Makefile.in -+++ b/gdb/Makefile.in -@@ -2326,6 +2326,8 @@ ALLDEPFILES = \ - sh-nbsd-nat.c \ - sh-nbsd-tdep.c \ - sh-tdep.c \ -+ sh-linux-tdep.c \ -+ sh-linux-nat.c \ - sol2-tdep.c \ - solib-aix.c \ - solib-spu.c \ -diff --git a/gdb/configure.host b/gdb/configure.host -index 23a2f16399..39a886ec53 100644 ---- a/gdb/configure.host -+++ b/gdb/configure.host -@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; - - s390*-*-linux*) gdb_host=linux ;; - -+sh*-*-linux*) gdb_host=linux ;; - sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu) - gdb_host=nbsd ;; - sh*-*-openbsd*) gdb_host=nbsd ;; -diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c -index db93967910..4109c549e8 100644 ---- a/gdb/sh-linux-tdep.c -+++ b/gdb/sh-linux-tdep.c -@@ -18,14 +18,37 @@ - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - #include "defs.h" -+#include "gdbcore.h" -+#include "frame.h" -+#include "frame-base.h" -+#include "frame-unwind.h" -+#include "dwarf2-frame.h" -+#include "value.h" -+#include "regcache.h" -+#include "inferior.h" - #include "osabi.h" - -+#include "reggroups.h" -+#include "arch-utils.h" -+#include "floatformat.h" - #include "solib-svr4.h" - #include "symtab.h" -+#include "gdb_string.h" -+#include "command.h" -+#include "gdb_assert.h" - - #include "trad-frame.h" - #include "tramp-frame.h" - -+#include <sys/ptrace.h> -+#include <sys/types.h> -+#include <sys/param.h> -+#include <sys/user.h> -+#include <sys/syscall.h> -+ -+#include <asm/ptrace.h> -+ -+#include "regset.h" - #include "glibc-tdep.h" - #include "sh-tdep.h" - #include "linux-tdep.h" -@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { - sh_linux_rt_sigreturn_init - }; - -+/* Recognizing signal handler frames. */ -+ -+/* GNU/Linux has two flavors of signals. Normal signal handlers, and -+ "realtime" (RT) signals. The RT signals can provide additional -+ information to the signal handler if the SA_SIGINFO flag is set -+ when establishing a signal handler using `sigaction'. It is not -+ unlikely that future versions of GNU/Linux will support SA_SIGINFO -+ for normal signals too. */ -+ -+/* When the SH Linux kernel calls a signal handler and the -+ SA_RESTORER flag isn't set, the return address points to a bit of -+ code on the stack. This function returns whether the PC appears to -+ be within this bit of code. -+ -+ The instruction sequence for normal signals is -+ mov.w 1f,r3 -+ trapa #16 -+ or r0, r0 -+ or r0, r0 -+ or r0, r0 -+ or r0, r0 -+ or r0, r0 -+ 1: .word __NR_sigreturn -+ or 0x9305 0xc310 0x200b 0x200b 0x200b 0x200b 0x200b 0x0077. -+ -+ Checking for the code sequence should be somewhat reliable, because -+ the effect is to call the system call sigreturn. This is unlikely -+ to occur anywhere other than a signal trampoline. -+ -+ It kind of sucks that we have to read memory from the process in -+ order to identify a signal trampoline, but there doesn't seem to be -+ any other way. The PC_IN_SIGTRAMP macro in tm-linux.h arranges to -+ only call us if no function name could be identified, which should -+ be the case since the code is on the stack. -+ -+ Detection of signal trampolines for handlers that set the -+ SA_RESTORER flag is in general not possible. Unfortunately this is -+ what the GNU C Library has been doing for quite some time now. -+ However, as of version 2.1.2, the GNU C Library uses signal -+ trampolines (named __restore and __restore_rt) that are identical -+ to the ones used by the kernel. Therefore, these trampolines are -+ supported too. */ -+ -+#define MOVW(n) (0x9300|((n)-2)) /* Move mem word at PC+n to R3 */ -+#define TRAP16 0xc310 /* Syscall w/no args (NR in R3) */ -+#define OR_R0_R0 0x200b /* or r0,r0 (insert to avoid hardware bug) */ -+ -+#define LINUX_SIGTRAMP_INSN0 MOVW(7) /* Move mem word at PC+7 to R3 */ -+#define LINUX_SIGTRAMP_INSN1 TRAP16 /* Syscall w/no args (NR in R3) */ -+#define LINUX_SIGTRAMP_INSN2 OR_R0_R0 /* or r0,r0 (insert to avoid hardware bug) */ -+ -+static const unsigned short linux_sigtramp_code[] = -+{ -+ LINUX_SIGTRAMP_INSN0, -+ LINUX_SIGTRAMP_INSN1, -+ LINUX_SIGTRAMP_INSN2, -+ LINUX_SIGTRAMP_INSN2, -+ LINUX_SIGTRAMP_INSN2, -+ LINUX_SIGTRAMP_INSN2, -+ LINUX_SIGTRAMP_INSN2, -+ __NR_sigreturn -+}; -+ -+#define LINUX_SIGTRAMP_LEN (sizeof linux_sigtramp_code) -+ -+/* If PC is in a sigtramp routine, return the address of the start of -+ the routine. Otherwise, return 0. */ -+ -+static CORE_ADDR -+sh_linux_sigtramp_start (struct frame_info *next_frame) -+{ -+ CORE_ADDR pc = get_frame_pc (next_frame); -+ gdb_byte buf[LINUX_SIGTRAMP_LEN]; -+ -+ /* We only recognize a signal trampoline if PC is at the start of -+ one of the three instructions. We optimize for finding the PC at -+ the start, as will be the case when the trampoline is not the -+ first frame on the stack. We assume that in the case where the -+ PC is not at the start of the instruction sequence, there will be -+ a few trailing readable bytes on the stack. */ -+ -+ if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_SIGTRAMP_LEN)) -+ return 0; -+ -+ if (buf[0] != LINUX_SIGTRAMP_INSN0) -+ { -+ if (buf[0] != LINUX_SIGTRAMP_INSN1) -+ return 0; -+ -+ pc -= 2; -+ -+ if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_SIGTRAMP_LEN)) -+ return 0; -+ } -+ -+ if (memcmp (buf, linux_sigtramp_code, LINUX_SIGTRAMP_LEN) != 0) -+ return 0; -+ -+ return pc; -+} -+ -+/* This function does the same for RT signals. Here the instruction -+ sequence is -+ mov.w 1f,r3 -+ trapa #16 -+ or r0, r0 -+ or r0, r0 -+ or r0, r0 -+ or r0, r0 -+ or r0, r0 -+ 1: .word __NR_rt_sigreturn -+ or 0x9305 0xc310 0x200b 0x200b 0x200b 0x200b 0x200b 0x00ad. -+ -+ The effect is to call the system call rt_sigreturn. */ -+ -+#define LINUX_RT_SIGTRAMP_INSN0 MOVW(7) /* Move mem word at PC+7 to R3 */ -+#define LINUX_RT_SIGTRAMP_INSN1 TRAP16 /* Syscall w/no args (NR in R3) */ -+#define LINUX_RT_SIGTRAMP_INSN2 OR_R0_R0 /* or r0,r0 (insert to avoid hardware bug) */ -+ -+static const unsigned short linux_rt_sigtramp_code[] = -+{ -+ LINUX_RT_SIGTRAMP_INSN0, -+ LINUX_RT_SIGTRAMP_INSN1, -+ LINUX_RT_SIGTRAMP_INSN2, -+ LINUX_RT_SIGTRAMP_INSN2, -+ LINUX_RT_SIGTRAMP_INSN2, -+ LINUX_RT_SIGTRAMP_INSN2, -+ LINUX_RT_SIGTRAMP_INSN2, -+ __NR_rt_sigreturn -+}; -+ -+#define LINUX_RT_SIGTRAMP_LEN (sizeof linux_rt_sigtramp_code) -+ -+/* If PC is in a RT sigtramp routine, return the address of the start -+ of the routine. Otherwise, return 0. */ -+ -+static CORE_ADDR -+sh_linux_rt_sigtramp_start (struct frame_info *next_frame) -+{ -+ CORE_ADDR pc = get_frame_pc (next_frame); -+ gdb_byte buf[LINUX_RT_SIGTRAMP_LEN]; -+ -+ /* We only recognize a signal trampoline if PC is at the start of -+ one of the two instructions. We optimize for finding the PC at -+ the start, as will be the case when the trampoline is not the -+ first frame on the stack. We assume that in the case where the -+ PC is not at the start of the instruction sequence, there will be -+ a few trailing readable bytes on the stack. */ -+ -+ if (!safe_frame_unwind_memory (next_frame, pc, buf, LINUX_RT_SIGTRAMP_LEN)) -+ return 0; -+ -+ if (buf[0] != LINUX_RT_SIGTRAMP_INSN0) -+ { -+ if (buf[0] != LINUX_RT_SIGTRAMP_INSN1) -+ return 0; -+ -+ pc -= 2; -+ -+ if (!safe_frame_unwind_memory (next_frame, pc, buf, -+ LINUX_RT_SIGTRAMP_LEN)) -+ return 0; -+ } -+ -+ if (memcmp (buf, linux_rt_sigtramp_code, LINUX_RT_SIGTRAMP_LEN) != 0) -+ return 0; -+ -+ return pc; -+} -+ -+/* Return whether PC is in a GNU/Linux sigtramp routine. */ -+ -+static int -+sh_linux_sigtramp_p (struct frame_info *this_frame) -+{ -+ CORE_ADDR pc = get_frame_pc (this_frame); -+ char *name; -+ -+ find_pc_partial_function (pc, &name, NULL, NULL); -+ -+ /* If we have NAME, we can optimize the search. The trampolines are -+ named __restore and __restore_rt. However, they aren't dynamically -+ exported from the shared C library, so the trampoline may appear to -+ be part of the preceding function. This should always be sigaction, -+ __sigaction, or __libc_sigaction (all aliases to the same function). */ -+ if (name == NULL || strstr (name, "sigaction") != NULL) -+ return (sh_linux_sigtramp_start (this_frame) != 0 -+ || sh_linux_rt_sigtramp_start (this_frame) != 0); -+ -+ return (strcmp ("__restore", name) == 0 -+ || strcmp ("__restore_rt", name) == 0); -+} -+ -+/* Offset to struct sigcontext in ucontext, from <asm/ucontext.h>. */ -+#define SH_LINUX_UCONTEXT_SIGCONTEXT_OFFSET 12 -+ -+ -+/* Assuming NEXT_FRAME is a frame following a GNU/Linux sigtramp -+ routine, return the address of the associated sigcontext structure. */ -+ -+static CORE_ADDR -+sh_linux_sigcontext_addr (struct frame_info *this_frame) -+{ -+ CORE_ADDR pc; -+ CORE_ADDR sp; -+ -+ sp = get_frame_register_unsigned (this_frame, SP_REGNUM); -+ -+ pc = sh_linux_sigtramp_start (this_frame); -+ if (pc) -+ { -+ return sp; -+ } -+ -+ pc = sh_linux_rt_sigtramp_start (this_frame); -+ if (pc) -+ { -+ CORE_ADDR ucontext_addr; -+ -+ /* The sigcontext structure is part of the user context. A -+ pointer to the user context is passed as the third argument -+ to the signal handler. */ -+ ucontext_addr = get_frame_register_unsigned (this_frame, ARG0_REGNUM+2); -+ return ucontext_addr + SH_LINUX_UCONTEXT_SIGCONTEXT_OFFSET; -+ } -+ -+ error ("Couldn't recognize signal trampoline."); -+ return 0; -+} -+ -+/* Signal trampolines. */ -+extern struct sh_frame_cache *sh_alloc_frame_cache (void); -+ -+static struct sh_frame_cache * -+sh_linux_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) -+{ -+ struct sh_frame_cache *cache; -+ struct gdbarch_tdep *tdep = gdbarch_tdep (get_current_arch ()); -+ CORE_ADDR sigcontext_addr; -+ -+ if (*this_cache) -+ return *this_cache; -+ -+ cache = sh_alloc_frame_cache (); -+ -+ cache->base = get_frame_register_unsigned (this_frame, SP_REGNUM); -+ sigcontext_addr = tdep->sigcontext_addr (this_frame); -+ if (tdep->sc_reg_offset) -+ { -+ int i; -+ -+ gdb_assert (tdep->sc_num_regs <= SH_NUM_REGS); -+ -+ for (i = 0; i < tdep->sc_num_regs; i++) -+ if (tdep->sc_reg_offset[i] != -1) -+ cache->saved_regs[i] = sigcontext_addr + tdep->sc_reg_offset[i]; -+ } -+ -+ *this_cache = cache; -+ return cache; -+} -+ -+static void -+sh_linux_sigtramp_frame_this_id (struct frame_info *this_frame, void **this_cache, -+ struct frame_id *this_id) -+{ -+ struct sh_frame_cache *cache = -+ sh_linux_sigtramp_frame_cache (this_frame, this_cache); -+ -+ (*this_id) = frame_id_build (cache->base + 64, cache->pc); -+} -+ -+extern struct value * sh_frame_prev_register (); -+static struct value * -+sh_linux_sigtramp_frame_prev_register (struct frame_info *this_frame, -+ void **this_cache, int regnum) -+{ -+ sh_linux_sigtramp_frame_cache (this_frame, this_cache); -+ -+ return sh_frame_prev_register (this_frame, this_cache, regnum); -+} -+ -+static int -+sh_linux_sigtramp_frame_sniffer (const struct frame_unwind *self, -+ struct frame_info *this_frame, -+ void **this_prologue_cache) -+{ -+ struct gdbarch_tdep *tdep = gdbarch_tdep (get_frame_arch (this_frame)); -+ -+ /* We shouldn't even bother if we don't have a sigcontext_addr -+ handler. */ -+ if (tdep->sigcontext_addr == NULL) -+ return 0; -+ -+ if (tdep->sigtramp_p != NULL) -+ { -+ if (tdep->sigtramp_p (this_frame)) -+ return 1; -+ } -+ -+ return 0; -+} -+ -+static const struct frame_unwind sh_linux_sigtramp_frame_unwind = -+{ -+ SIGTRAMP_FRAME, -+ sh_linux_sigtramp_frame_this_id, -+ sh_linux_sigtramp_frame_prev_register, -+ NULL, -+ sh_linux_sigtramp_frame_sniffer -+}; -+ -+/* Supply register REGNUM from the buffer specified by GREGS and LEN -+ in the general-purpose register set REGSET to register cache -+ REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */ -+ -+void -+sh_supply_gregset (const struct regset *regset, struct regcache *regcache, -+ int regnum, const void *gregs, size_t len) -+{ -+ const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch); -+ const char *regs = gregs; -+ int i; -+ -+ gdb_assert (len == tdep->sizeof_gregset); -+ -+ for (i = 0; i < tdep->gregset_num_regs; i++) -+ { -+ if ((regnum == i || regnum == -1) -+ && tdep->gregset_reg_offset[i] != -1) -+ regcache_raw_supply (regcache, i, regs + tdep->gregset_reg_offset[i]); -+ } -+} -+ -+/* Collect register REGNUM from the register cache REGCACHE and store -+ it in the buffer specified by GREGS and LEN as described by the -+ general-purpose register set REGSET. If REGNUM is -1, do this for -+ all registers in REGSET. */ -+ -+void -+sh_collect_gregset (const struct regset *regset, -+ const struct regcache *regcache, -+ int regnum, void *gregs, size_t len) -+{ -+ const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch); -+ char *regs = gregs; -+ int i; -+ -+ gdb_assert (len == tdep->sizeof_gregset); -+ -+ for (i = 0; i < tdep->gregset_num_regs; i++) -+ { -+ if ((regnum == i || regnum == -1) -+ && tdep->gregset_reg_offset[i] != -1) -+ regcache_raw_collect (regcache, i, regs + tdep->gregset_reg_offset[i]); -+ } -+} -+ -+/* Supply register REGNUM from the buffer specified by FPREGS and LEN -+ in the floating-point register set REGSET to register cache -+ REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */ -+ -+static void -+sh_supply_fpregset (const struct regset *regset, struct regcache *regcache, -+ int regnum, const void *fpregs, size_t len) -+{ -+ const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch); -+ const char *regs = fpregs; -+ int i; -+ -+ gdb_assert (len == tdep->sizeof_fpregset); -+ for (i = 0; i < 16; i++) -+ { -+ if (regnum == i+25 || regnum == -1) -+ regcache_raw_supply (regcache, i+25, regs + i*4); -+ } -+ if (regnum == FPSCR_REGNUM || regnum == -1) -+ regcache_raw_supply (regcache, FPSCR_REGNUM, regs + 32*4); -+ if (regnum == FPUL_REGNUM || regnum == -1) -+ regcache_raw_supply (regcache, FPUL_REGNUM, regs + 33*4); -+} -+ -+/* Collect register REGNUM from the register cache REGCACHE and store -+ it in the buffer specified by FPREGS and LEN as described by the -+ floating-point register set REGSET. If REGNUM is -1, do this for -+ all registers in REGSET. */ -+ -+static void -+sh_collect_fpregset (const struct regset *regset, -+ const struct regcache *regcache, -+ int regnum, void *fpregs, size_t len) -+{ -+ const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch); -+ char *regs = fpregs; -+ int i; -+ -+ gdb_assert (len == tdep->sizeof_fpregset); -+ for (i = 0; i < 16; i++) -+ { -+ if (regnum == i+25 || regnum == -1) -+ regcache_raw_collect (regcache, i+25, regs + i*4); -+ } -+ if (regnum == FPSCR_REGNUM || regnum == -1) -+ regcache_raw_collect (regcache, FPSCR_REGNUM, regs + 32*4); -+ if (regnum == FPUL_REGNUM || regnum == -1) -+ regcache_raw_collect (regcache, FPUL_REGNUM, regs + 33*4); -+} -+ -+/* Return the appropriate register set for the core section identified -+ by SECT_NAME and SECT_SIZE. */ -+ -+const struct regset * -+sh_linux_regset_from_core_section (struct gdbarch *gdbarch, -+ const char *sect_name, size_t sect_size) -+{ -+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); -+ -+ if (strcmp (sect_name, ".reg") == 0 && sect_size == tdep->sizeof_gregset) -+ { -+ if (tdep->gregset == NULL) -+ tdep->gregset = regset_alloc (gdbarch, sh_supply_gregset, -+ sh_collect_gregset); -+ return tdep->gregset; -+ } -+ -+ if ((strcmp (sect_name, ".reg2") == 0 && sect_size == tdep->sizeof_fpregset)) -+ { -+ if (tdep->fpregset == NULL) -+ tdep->fpregset = regset_alloc (gdbarch, sh_supply_fpregset, -+ sh_collect_fpregset); -+ return tdep->fpregset; -+ } -+ -+ return NULL; -+} -+ -+/* The register sets used in GNU/Linux ELF core-dumps are identical to -+ the register sets in `struct user' that are used for a.out -+ core-dumps. These are also used by ptrace(2). The corresponding -+ types are `elf_gregset_t' for the general-purpose registers (with -+ `elf_greg_t' the type of a single GP register) and `elf_fpregset_t' -+ for the floating-point registers. -+ -+ Those types used to be available under the names `gregset_t' and -+ `fpregset_t' too, and GDB used those names in the past. But those -+ names are now used for the register sets used in the `mcontext_t' -+ type, which have a different size and layout. */ -+ -+/* Mapping between the general-purpose registers in `struct user' -+ format and GDB's register cache layout. */ -+ -+/* From <sys/reg.h>. */ -+static int sh_linux_gregset_reg_offset[] = -+{ -+ 0, 4, 8, 12, 16, 20, 24, 28, -+ 32, 36, 40, 44, 48, 52, 56, 60, -+ -+ REG_PC*4, REG_PR*4, REG_GBR*4, -1, -+ REG_MACH*4, REG_MACL*4, REG_SR*4, -+}; -+ -+/* Mapping between the general-purpose registers in `struct -+ sigcontext' format and GDB's register cache layout. */ -+ -+/* From <asm/sigcontext.h>. */ -+static int sh_linux_sc_reg_offset[] = -+{ -+ 4, 8, 12, 16, 20, 24, 28, 32, -+ 36, 40, 44, 48, 52, 56, 60, 64, -+ 68, 72, 80, -1, -+ 84, 88, 76 -+}; -+ - static void - sh_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) - { -+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); -+ bfd abfd; -+ -+ tdep->gregset_reg_offset = sh_linux_gregset_reg_offset; -+ tdep->gregset_num_regs = ARRAY_SIZE (sh_linux_gregset_reg_offset); -+ tdep->sizeof_gregset = 23 * 4; -+ -+ tdep->jb_pc_offset = 32; /* From <bits/setjmp.h>. */ -+ -+ tdep->sigtramp_p = sh_linux_sigtramp_p; -+ tdep->sigcontext_addr = sh_linux_sigcontext_addr; -+ tdep->sc_reg_offset = sh_linux_sc_reg_offset; -+ tdep->sc_num_regs = ARRAY_SIZE (sh_linux_sc_reg_offset); -+ -+ frame_unwind_append_unwinder(gdbarch, &sh_linux_sigtramp_frame_unwind); -+ -+ /* If we have a register mapping, enable the generic core file -+ support, unless it has already been enabled. */ -+ if (tdep->gregset_reg_offset -+ && !gdbarch_regset_from_core_section_p (gdbarch)) -+ set_gdbarch_regset_from_core_section (gdbarch, -+ sh_linux_regset_from_core_section); -+ - linux_init_abi (info, gdbarch); - - /* GNU/Linux uses SVR4-style shared libraries. */ -diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c -index fe64cf979a..4417114cd0 100644 ---- a/gdb/sh-tdep.c -+++ b/gdb/sh-tdep.c -@@ -21,6 +21,9 @@ - sac@cygnus.com. */ - - #include "defs.h" -+#include "arch-utils.h" -+#include "command.h" -+#include "dummy-frame.h" - #include "frame.h" - #include "frame-base.h" - #include "frame-unwind.h" -@@ -66,23 +69,6 @@ static const char *const sh_cc_enum[] = { - - static const char *sh_active_calling_convention = sh_cc_gcc; - --#define SH_NUM_REGS 67 -- --struct sh_frame_cache --{ -- /* Base address. */ -- CORE_ADDR base; -- LONGEST sp_offset; -- CORE_ADDR pc; -- -- /* Flag showing that a frame has been created in the prologue code. */ -- int uses_fp; -- -- /* Saved registers. */ -- CORE_ADDR saved_regs[SH_NUM_REGS]; -- CORE_ADDR saved_sp; --}; -- - static int - sh_is_renesas_calling_convention (struct type *func_type) - { -@@ -1050,7 +1036,7 @@ sh_treat_as_flt_p (struct type *type) - return 0; - /* Otherwise if the type of that member is float, the whole type is - treated as float. */ -- if (TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) == TYPE_CODE_FLT) -+ if (TYPE_CODE (check_typedef (TYPE_FIELD_TYPE (type, 0))) == TYPE_CODE_FLT) - return 1; - /* Otherwise it's not treated as float. */ - return 0; -@@ -1100,7 +1086,7 @@ sh_push_dummy_call_fpu (struct gdbarch *gdbarch, - in four registers available. Loop thru args from first to last. */ - for (argnum = 0; argnum < nargs; argnum++) - { -- type = value_type (args[argnum]); -+ type = check_typedef (value_type (args[argnum])); - len = TYPE_LENGTH (type); - val = sh_justify_value_in_reg (gdbarch, args[argnum], len); - -@@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, - reg->how = DWARF2_FRAME_REG_UNDEFINED; - } - --static struct sh_frame_cache * -+struct sh_frame_cache * - sh_alloc_frame_cache (void) - { - struct sh_frame_cache *cache; -@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) - return cache; - } - --static struct sh_frame_cache * -+struct sh_frame_cache * - sh_frame_cache (struct frame_info *this_frame, void **this_cache) - { - struct gdbarch *gdbarch = get_frame_arch (this_frame); -@@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) - return cache; - } - --static struct value * --sh_frame_prev_register (struct frame_info *this_frame, -- void **this_cache, int regnum) -+struct value * -+sh_frame_prev_register (struct frame_info *this_frame, void **this_cache, -+ int regnum) - { - struct gdbarch *gdbarch = get_frame_arch (this_frame); - struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); -@@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, - the current frame. Frob regnum so that we pull the value from - the correct place. */ - if (regnum == gdbarch_pc_regnum (gdbarch)) -- regnum = PR_REGNUM; -+ regnum = PR_REGNUM; /* XXX: really? */ - - if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) - return frame_unwind_got_memory (this_frame, regnum, -@@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, - static struct gdbarch * - sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) - { -- struct gdbarch *gdbarch; - struct gdbarch_tdep *tdep; -+ struct gdbarch *gdbarch; - - /* If there is already a candidate, use it. */ - arches = gdbarch_list_lookup_by_info (arches, &info); -@@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) - tdep = XCNEW (struct gdbarch_tdep); - gdbarch = gdbarch_alloc (&info, tdep); - -+ /* General-purpose registers. */ -+ tdep->gregset = NULL; -+ tdep->gregset_reg_offset = NULL; -+ tdep->gregset_num_regs = 23; -+ tdep->sizeof_gregset = 0; -+ -+ /* Floating-point registers. */ -+ tdep->fpregset = NULL; -+ tdep->sizeof_fpregset = 34*4; -+ -+ tdep->jb_pc_offset = -1; -+ - set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); - set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); - set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); -@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) - break; - } - -+ dwarf2_append_unwinders (gdbarch); -+ - /* Hook in ABI-specific overrides, if they have been registered. */ - gdbarch_init_osabi (info, gdbarch); - -- dwarf2_append_unwinders (gdbarch); - frame_unwind_append_unwinder (gdbarch, &sh_stub_unwind); - frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); - -diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h -index 59acd35b88..be3f998d84 100644 ---- a/gdb/sh-tdep.h -+++ b/gdb/sh-tdep.h -@@ -21,6 +21,12 @@ - - /* Contributed by Steve Chamberlain sac@cygnus.com. */ - -+struct frame_info; -+struct gdbarch; -+struct reggroup; -+struct regset; -+struct regcache; -+ - /* Registers for all SH variants. Used also by sh3-rom.c. */ - enum - { -@@ -29,6 +35,7 @@ enum - ARG0_REGNUM = 4, - ARGLAST_REGNUM = 7, - FP_REGNUM = 14, -+ SP_REGNUM = 15, - PC_REGNUM = 16, - PR_REGNUM = 17, - GBR_REGNUM = 18, -@@ -81,6 +88,24 @@ enum - FV0_REGNUM = 76, - FV_LAST_REGNUM = 79 - }; -+#define SH_NUM_REGS 67 -+ -+struct sh_frame_cache -+{ -+ /* Base address. */ -+ CORE_ADDR base; -+ LONGEST sp_offset; -+ CORE_ADDR pc; -+ -+ /* Flag showing that a frame has been created in the prologue code. */ -+ int uses_fp; -+ -+ /* Saved registers. */ -+ CORE_ADDR saved_regs[SH_NUM_REGS]; -+ CORE_ADDR saved_sp; -+}; -+ -+extern struct sh_frame_cache *sh_frame_cache (struct frame_info *next_frame, void **this_cache); - - /* This structure describes a register in a core-file. */ - struct sh_corefile_regmap -@@ -89,8 +114,32 @@ struct sh_corefile_regmap - unsigned int offset; - }; - -+/* sh architecture specific information. */ - struct gdbarch_tdep - { -+ /* General-purpose registers. */ -+ struct regset *gregset; -+ int *gregset_reg_offset; -+ int gregset_num_regs; -+ size_t sizeof_gregset; -+ -+ /* Floating-point registers. */ -+ struct regset *fpregset; -+ size_t sizeof_fpregset; -+ -+ /* Offset of saved PC in jmp_buf. */ -+ int jb_pc_offset; -+ -+ /* Detect sigtramp. */ -+ int (*sigtramp_p) (struct frame_info *); -+ -+ /* Get address of sigcontext for sigtramp. */ -+ CORE_ADDR (*sigcontext_addr) (struct frame_info *); -+ -+ /* Offset of registers in `struct sigcontext'. */ -+ int *sc_reg_offset; -+ int sc_num_regs; -+ - /* Non-NULL when debugging from a core file. Provides the offset - where each general-purpose register is stored inside the associated - core file section. */ -diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp -index 9879f0ca47..cbc0e4d5f7 100644 ---- a/gdb/testsuite/gdb.asm/asm-source.exp -+++ b/gdb/testsuite/gdb.asm/asm-source.exp -@@ -116,6 +116,11 @@ switch -glob -- [istarget] { - append link-flags " -m elf32ppc" - } - } -+ "sh*-linux*" { -+ set asm-arch sh-linux -+ set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}" -+ set debug-flags "-gdwarf-2" -+ } - "sh*-*-*" { - set asm-arch sh - set debug-flags "-gdwarf-2" -diff --git a/gdb/testsuite/gdb.asm/sh.inc b/gdb/testsuite/gdb.asm/sh.inc -index a4a5fc545e..89efed7795 100644 ---- a/gdb/testsuite/gdb.asm/sh.inc -+++ b/gdb/testsuite/gdb.asm/sh.inc -@@ -40,9 +40,8 @@ - mov.l .Lconst\@,r1 - bra .Lafterconst\@ - nop -- nop --.Lconst\@: - .align 2 -+.Lconst\@: - .long \subr - .align 1 - .Lafterconst\@: -diff --git a/gdb/testsuite/gdb.base/annota1.c b/gdb/testsuite/gdb.base/annota1.c -index 424e1b8327..0de2e7b633 100644 ---- a/gdb/testsuite/gdb.base/annota1.c -+++ b/gdb/testsuite/gdb.base/annota1.c -@@ -1,6 +1,9 @@ - #include <stdio.h> - #include <signal.h> - -+#ifdef __sh__ -+#define signal(a,b) /* Signals not supported on this target - make them go away */ -+#endif - - void - handle_USR1 (int sig) -diff --git a/gdb/testsuite/gdb.base/annota3.c b/gdb/testsuite/gdb.base/annota3.c -index 424e1b8327..952aaf218a 100644 ---- a/gdb/testsuite/gdb.base/annota3.c -+++ b/gdb/testsuite/gdb.base/annota3.c -@@ -1,6 +1,10 @@ - #include <stdio.h> - #include <signal.h> - -+#ifdef __sh__ -+#define signal(a,b) /* Signals not supported on this target - make them go away */ -+#endif -+ - - void - handle_USR1 (int sig) -diff --git a/gdb/testsuite/gdb.base/sigall.c b/gdb/testsuite/gdb.base/sigall.c -index 81f3b08d6b..1574b2d6cb 100644 ---- a/gdb/testsuite/gdb.base/sigall.c -+++ b/gdb/testsuite/gdb.base/sigall.c -@@ -1,6 +1,9 @@ - #include <signal.h> - #include <unistd.h> - -+#ifdef __sh__ -+#define signal(a,b) /* Signals not supported on this target - make them go away */ -+#endif - - /* Signal handlers, we set breakpoints in them to make sure that the - signals really get delivered. */ -diff --git a/gdb/testsuite/gdb.base/signals.c b/gdb/testsuite/gdb.base/signals.c -index 756606880f..1205a9bc9c 100644 ---- a/gdb/testsuite/gdb.base/signals.c -+++ b/gdb/testsuite/gdb.base/signals.c -@@ -3,6 +3,10 @@ - #include <signal.h> - #include <unistd.h> - -+#ifdef __sh__ -+#define signal(a,b) /* Signals not supported on this target - make them go away */ -+#define alarm(a) /* Ditto for alarm() */ -+#endif - - static int count = 0; - --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch index bc4bc26835..7631e75048 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch @@ -1,7 +1,7 @@ -From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 +From e7041e9346aa0c3aee0b76315559e3ab2ef8977e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 09/11] Change order of CFLAGS +Subject: [PATCH] Change order of CFLAGS Lets us override Werror if need be @@ -9,22 +9,19 @@ Upstream-Status: Inappropriate Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - gdb/gdbserver/Makefile.in | 2 +- + gdbserver/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in -index f2f8a084bd..9528db1364 100644 ---- a/gdb/gdbserver/Makefile.in -+++ b/gdb/gdbserver/Makefile.in -@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ - INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} +diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in +index b597515d428..9e615e2842d 100644 +--- a/gdbserver/Makefile.in ++++ b/gdbserver/Makefile.in +@@ -156,7 +156,7 @@ WIN32APILIBS = @WIN32APILIBS@ + INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \ + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch index 809d52f250..45388c5ac5 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch @@ -1,7 +1,7 @@ -From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 +From 477f1b2049c7f940b8e8fda4ac396cfe322b269f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 10/11] resolve restrict keyword conflict +Subject: [PATCH] resolve restrict keyword conflict GCC detects that we call 'restrict' as param name in function signatures and complains since both params are called 'restrict' @@ -11,13 +11,13 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - gdb/gnulib/import/sys_time.in.h | 8 ++++---- + gnulib/import/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h -index b4a0e49c50..d22cea9aaf 100644 ---- a/gdb/gnulib/import/sys_time.in.h -+++ b/gdb/gnulib/import/sys_time.in.h +diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h +index 87db1a88745..e6b98c7e467 100644 +--- a/gnulib/import/sys_time.in.h ++++ b/gnulib/import/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval # define gettimeofday rpl_gettimeofday # endif @@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 # endif _GL_CXXALIASWARN (gettimeofday); # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0007-Fix-invalid-sigprocmask-call.patch index bce025c391..26e3ad9098 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Fix-invalid-sigprocmask-call.patch @@ -1,7 +1,7 @@ -From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 +From ebeb6125acf6b4e4a8a4eaa59e2830b9ca02d683 Mon Sep 17 00:00:00 2001 From: Yousong Zhou <yszhou4tech@gmail.com> Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 11/11] Fix invalid sigprocmask call +Subject: [PATCH] Fix invalid sigprocmask call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- Signed-off-by: André Draszik <adraszik@tycoint.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - gdb/common/signals-state-save-restore.c | 2 +- + gdbsupport/signals-state-save-restore.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c -index 5bb66321bb..6597decbc6 100644 ---- a/gdb/common/signals-state-save-restore.c -+++ b/gdb/common/signals-state-save-restore.c -@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) +diff --git a/gdbsupport/signals-state-save-restore.cc b/gdbsupport/signals-state-save-restore.cc +index 3ec7a259c9c..0702eca7725 100644 +--- a/gdbsupport/signals-state-save-restore.cc ++++ b/gdbsupport/signals-state-save-restore.cc +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; -- res = sigprocmask (0, NULL, &original_signal_mask); -+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); +- res = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); if (res == -1) perror_with_name (("sigprocmask")); --- -2.18.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch new file mode 100644 index 0000000000..819f1c9f17 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch @@ -0,0 +1,48 @@ +From cb7c8df338184d2d2f31ee1fd238653e3162da44 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Jan 2023 00:16:25 -0800 +Subject: [PATCH] Define alignof using _Alignof when using C11 or newer + +WG14 N2350 made very clear that it is an UB having type definitions +within "offsetof" [1]. This patch enhances the implementation of macro +alignof to use builtin "_Alignof" to avoid undefined behavior on +when using std=c11 or newer + +clang 16+ has started to flag this [2] + +Fixes build when using -std >= gnu11 and using clang16+ + +Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it +may support C11, exclude those compilers too + +[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm +[2] https://reviews.llvm.org/D133574 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libiberty/sha1.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libiberty/sha1.c b/libiberty/sha1.c +index 6c71e3ebb41..a2caf947d31 100644 +--- a/libiberty/sha1.c ++++ b/libiberty/sha1.c +@@ -229,7 +229,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) + if (len >= 64) + { + #if !_STRING_ARCH_unaligned ++/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 ++ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. ++ clang versions < 8.0.0 have the same bug. */ ++#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ ++ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ ++ && !defined __clang__) \ ++ || (defined __clang__ && __clang_major__ < 8)) + # define alignof(type) offsetof (struct { char c; type x; }, x) ++#else ++# define alignof(type) _Alignof(type) ++#endif + # define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0) + if (UNALIGNED_P (buffer)) + while (len > 64) diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch deleted file mode 100644 index 95bec5fd60..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ /dev/null @@ -1,48 +0,0 @@ -From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Apr 2016 15:31:40 -0700 -Subject: [PATCH] Use exorted definitions of SIGRTMIN - -Define W_STOPCODE if not defined already - -__SIGRTMIN is internal to glibc and other libcs e.g. musl -may not provide them - -Fixes -https://sourceware.org/bugzilla/show_bug.cgi?id=13012 - -Upstream-Status: Submitted - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - gdb/linux-nat.c | 4 ++-- - gdb/nat/linux-nat.h | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c -index 063afe26..fb1d2d5d 100644 ---- a/gdb/linux-nat.c -+++ b/gdb/linux-nat.c -@@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) - /* NPTL reserves the first two RT signals, but does not provide any - way for the debugger to query the signal numbers - fortunately - they don't change. */ -- sigaddset (set, __SIGRTMIN); -- sigaddset (set, __SIGRTMIN + 1); -+ sigaddset (set, SIGRTMIN); -+ sigaddset (set, SIGRTMIN + 1); - } -diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 1e32dd9e..b886305d 100644 ---- a/gdb/nat/linux-nat.h -+++ b/gdb/nat/linux-nat.h -@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); - - extern int lwp_is_stepping (struct lwp_info *lwp); - -+#ifndef W_STOPCODE -+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f) -+#endif -+ - #endif /* NAT_LINUX_NAT_H */ diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a713..0000000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 -From: Keith Seitz <keiths@redhat.com> -Date: Wed, 16 Oct 2019 11:33:59 -0700 -Subject: [PATCH] DWARF reader: Reject sections with invalid sizes - -This is another fuzzer bug, gdb/23567. This time, the fuzzer has -specifically altered the size of .debug_str: - -$ eu-readelf -S objdump -Section Headers: -[Nr] Name Type Addr Off Size ES Flags Lk Inf Al -[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 - -When this file is loaded into GDB, the DWARF reader crashes attempting -to access the string table (or it may just store a bunch of nonsense): - -[gdb-8.3-6-fc30] -$ gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -Segmentation fault (core dumped) - -Nick has already committed a BFD patch to issue the warning seen above. - -[gdb master 6acc1a0b] -$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... -(gdb) inf func -All defined functions: - -File ./../include/dwarf2.def: -186: const - - 8 *>(.: - ;'@�B); -747: const - - 8 *�(.: - ;'@�B); -701: const - - 8 *�D � - (.: - ;'@�B); -71: const - - 8 *(.: - ;'@�B); -/* and more gibberish */ - -Consider read_indirect_string_at_offset_from: - -static const char * -read_indirect_string_at_offset_from (struct objfile *objfile, - bfd *abfd, LONGEST str_offset, - struct dwarf2_section_info *sect, - const char *form_name, - const char *sect_name) -{ - dwarf2_read_section (objfile, sect); - if (sect->buffer == NULL) - error (_("%s used without %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - if (str_offset >= sect->size) - error (_("%s pointing outside of %s section [in module %s]"), - form_name, sect_name, bfd_get_filename (abfd)); - gdb_assert (HOST_CHAR_BIT == 8); - if (sect->buffer[str_offset] == '\0') - return NULL; - return (const char *) (sect->buffer + str_offset); -} - -With sect_size being ginormous, the code attempts to access -sect->buffer[GINORMOUS], and depending on the layout of memory, -GDB either stores a bunch of gibberish strings or crashes. - -This is an attempt to mitigate this by implementing a similar approach -used by BFD. In our case, we simply reject the section with the invalid -length: - -$ ./gdb -nx -q objdump -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size -Reading symbols from /path/to/objdump... - -warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] -DW_FORM_strp used without .debug_str section [in module /path/to/objdump] -(No debugging symbols found in /path/to/objdump) -(gdb) - -Unfortunately, I have not found a way to regression test this, since it -requires poking ELF section headers. - -gdb/ChangeLog: -2019-10-16 Keith Seitz <keiths@redhat.com> - - PR gdb/23567 - * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard - sections whose size is greater than the file size. - -Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f - -CVE: CVE-2019-1010180 -Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] -[Removed Changelog entry] -Signed-off-by: Vinay Kumar <vinay.m.engg@gmail.com> ---- - gdb/dwarf2read.c | 9 +++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 0443b55..a78f818 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, - if ((aflag & SEC_HAS_CONTENTS) == 0) - { - } -+ else if (elf_section_data (sectp)->this_hdr.sh_size -+ > bfd_get_file_size (abfd)) -+ { -+ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; -+ warning (_("Discarding section %s which has a section size (%s" -+ ") larger than the file size [in module %s]"), -+ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), -+ bfd_get_filename (abfd)); -+ } - else if (section_is_p (sectp->name, &names.info)) - { - this->info.s.section = sectp; --- -2.7.4 - diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_14.2.bb index d70757a151..9c6db4ca2c 100644 --- a/meta/recipes-devtools/gdb/gdb_8.3.1.bb +++ b/meta/recipes-devtools/gdb/gdb_14.2.bb @@ -1,9 +1,19 @@ +require gdb-common.inc + +inherit gettext pkgconfig + +#LDFLAGS:append = " -s" +#export CFLAGS:append=" -L${STAGING_LIBDIR}" + +# cross-canadian must not see this +PACKAGES =+ "gdbserver" +FILES:gdbserver = "${bindir}/gdbserver" + require gdb.inc -require gdb-${PV}.inc inherit python3-dir -EXTRA_OEMAKE_append_libc-musl = "\ +EXTRA_OEMAKE:append:libc-musl = "\ gt_cv_func_gnugettext1_libc=yes \ gt_cv_func_gnugettext2_libc=yes \ gl_cv_func_working_strerror=yes \ @@ -11,7 +21,7 @@ EXTRA_OEMAKE_append_libc-musl = "\ gl_cv_func_gettimeofday_clobber=no \ " -do_configure_prepend() { +do_configure:prepend() { if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then cat > ${WORKDIR}/python << EOF #!/bin/sh @@ -26,3 +36,4 @@ EOF chmod +x ${WORKDIR}/python fi } + |