From e7dd0666bd464756cf72fb1bedf70482b95ec819 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 22 Feb 2023 16:38:30 -0800 Subject: gdb: Upgrade to 13.1 Add patch to fix typo for build on musl GDB 13.1 includes the following changes and enhancements: * Support for the following new targets has been added in both GDB and GDBserver: ** GNU/Linux/LoongArch (gdbserver) loongarch*-*-linux* ** GNU/Linux/CSKY (gdbserver) csky*-*linux* * The Windows native target now supports target async. * FreeBSD: ** Arm and AArch64: Support for Thread Local Storage (TLS) variables ** Hardware watchpoint support on AArch64 FreeBSD * Floating-point support has now been added on LoongArch GNU/Linux. * New commands: ** set print nibbles [on|off] show print nibbles This controls whether the 'print/t' command will display binary values in groups of four bits, known as "nibbles". The default is 'off'. ** Various styling-related commands. See the gdb/NEWS file for more details (see link at the bottom). ** Various maintenance commands. These are normally aimed at GDB experts or developers. See the gdb/NEWS file for more details (see link at the bottom). * Python API improvements: ** New Python API for instruction disassembly. The new attribute 'locations' of gdb.Breakpoint returns a list of gdb.BreakpointLocation objects specifying the locations where the breakpoint is inserted into the debuggee. ** New Python type gdb.BreakpointLocation. ** New function gdb.format_address(ADDRESS, PROGSPACE, ARCHITECTURE) that formats ADDRESS as 'address ' ** New function gdb.current_language that returns the name of the current language. Unlike gdb.parameter('language'), this will never return 'auto'. ** New function gdb.print_options that returns a dictionary of the prevailing print options, in the form accepted by gdb.Value.format_string. ** New method gdb.Frame.language that returns the name of the frame's language. ** gdb.Value.format_string now uses the format provided by 'print', if it is called during a 'print' or other similar operation. ** gdb.Value.format_string now accepts the 'summary' keyword. This can be used to request a shorter representation of a value, the way that 'set print frame-arguments scalars' does. ** The gdb.register_window_type method now restricts the set of acceptable window names. The first character of a window's name must start with a character in the set [a-zA-Z], every subsequent character of a window's name must be in the set [-_.a-zA-Z0-9]. * GDB/MI changes: ** MI version 1 is deprecated, and will be removed in GDB 14. ** The async record stating the stopped reason 'breakpoint-hit' now contains an optional field locno. * Miscellaneous improvements: ** gdb now supports zstd compressed debug sections (ELFCOMPRESS_ZSTD) for ELF. ** New convenience variable $_inferior_thread_count contains the number of live threads in the current inferior. ** New convenience variables $_hit_bpnum and $_hit_locno, set to the breakpoint number and the breakpoint location number of the breakpoint last hit. ** The "info breakpoints" now displays enabled breakpoint locations of disabled breakpoints as in the "y-" state. ** The format of 'disassemble /r' and 'record instruction-history /r' has changed to match the layout of GNU objdump when disassembling. A new format "/b" has been introduce to provide the old behavior of "/r". ** The TUI no longer styles the source and assembly code highlighted by the current position indicator by default. You can however re-enable styling using the new "set style tui-current-position" command. ** It is now possible to use the "document" command to document user-defined commands. ** Support for memory tag data for AArch64 MTE. * Support Removal notices: ** DBX mode has been removed. ** Support for building against Python version 2 has been removed. It is now only possible to build GDB against Python 3. ** Support for the following commands has been removed: set debug aix-solib on|off show debug aix-solib set debug solib-frv on|off show debug solib-frv Use the "set/show debug solib" commands instead. For a complete list and more details on each item, please see the gdb/NEWS file, available at [1]: [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blob_plain;f=gdb/NEWS;hb=gdb-13.1-release (From OE-Core rev: 87a8c2af735e06338463414a2cbcd3224b9ea112) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../gdb/gdb-cross-canadian_12.1.bb | 3 -- .../gdb/gdb-cross-canadian_13.1.bb | 3 ++ meta/recipes-devtools/gdb/gdb-cross_12.1.bb | 2 - meta/recipes-devtools/gdb/gdb-cross_13.1.bb | 2 + meta/recipes-devtools/gdb/gdb.inc | 22 ++++----- ...0001-make-man-install-relative-to-DESTDIR.patch | 28 ------------ ...s-linux-nat-Define-_ABIO32-if-not-defined.patch | 32 +++++++++++++ ...s-linux-nat-Define-_ABIO32-if-not-defined.patch | 35 --------------- ...Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 49 ++++++++++++++++++++ ...e-libreadline.a-when-using-disable-static.patch | 47 +++++++++++++++++++ ...Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 52 ---------------------- ...e-libreadline.a-when-using-disable-static.patch | 50 --------------------- .../gdb/gdb/0004-use-asm-sgidefs.h.patch | 33 ++++++++++++++ .../gdb/gdb/0005-Change-order-of-CFLAGS.patch | 27 +++++++++++ .../gdb/gdb/0005-use-asm-sgidefs.h.patch | 36 --------------- .../gdb/gdb/0006-Change-order-of-CFLAGS.patch | 30 ------------- .../0006-resolve-restrict-keyword-conflict.patch | 45 +++++++++++++++++++ .../gdb/0007-Fix-invalid-sigprocmask-call.patch | 46 +++++++++++++++++++ .../0007-resolve-restrict-keyword-conflict.patch | 48 -------------------- ...nof-using-_Alignof-when-using-C11-or-newe.patch | 15 ++----- .../gdb/0008-Fix-invalid-sigprocmask-call.patch | 49 -------------------- .../gdb/gdb/0009-gdbserver-ctrl-c-handling.patch | 40 ----------------- ...inux-low.cc-Fix-a-typo-in-ternary-operato.patch | 24 ++++++++++ meta/recipes-devtools/gdb/gdb/readline-8.2.patch | 39 ---------------- meta/recipes-devtools/gdb/gdb_12.1.bb | 39 ---------------- meta/recipes-devtools/gdb/gdb_13.1.bb | 39 ++++++++++++++++ 26 files changed, 362 insertions(+), 473 deletions(-) delete mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_12.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb delete mode 100644 meta/recipes-devtools/gdb/gdb-cross_12.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb-cross_13.1.bb delete mode 100644 meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch create mode 100644 meta/recipes-devtools/gdb/gdb/0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch create mode 100644 meta/recipes-devtools/gdb/gdb/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch create mode 100644 meta/recipes-devtools/gdb/gdb/0003-Dont-disable-libreadline.a-when-using-disable-static.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/0004-Dont-disable-libreadline.a-when-using-disable-static.patch create mode 100644 meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch create mode 100644 meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/0005-use-asm-sgidefs.h.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/0006-Change-order-of-CFLAGS.patch create mode 100644 meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch create mode 100644 meta/recipes-devtools/gdb/gdb/0007-Fix-invalid-sigprocmask-call.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/0007-resolve-restrict-keyword-conflict.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/0008-Fix-invalid-sigprocmask-call.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/0009-gdbserver-ctrl-c-handling.patch create mode 100644 meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/readline-8.2.patch delete mode 100644 meta/recipes-devtools/gdb/gdb_12.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb_13.1.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_12.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_12.1.bb deleted file mode 100644 index 4ab2b7156d..0000000000 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_12.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gdb-common.inc -require gdb-cross-canadian.inc -require gdb.inc diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb new file mode 100644 index 0000000000..4ab2b7156d --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_13.1.bb @@ -0,0 +1,3 @@ +require gdb-common.inc +require gdb-cross-canadian.inc +require gdb.inc diff --git a/meta/recipes-devtools/gdb/gdb-cross_12.1.bb b/meta/recipes-devtools/gdb/gdb-cross_12.1.bb deleted file mode 100644 index 3b654a2f0d..0000000000 --- a/meta/recipes-devtools/gdb/gdb-cross_12.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require gdb-cross.inc -require gdb.inc diff --git a/meta/recipes-devtools/gdb/gdb-cross_13.1.bb b/meta/recipes-devtools/gdb/gdb-cross_13.1.bb new file mode 100644 index 0000000000..3b654a2f0d --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross_13.1.bb @@ -0,0 +1,2 @@ +require gdb-cross.inc +require gdb.inc diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index a5dc554581..18603cc7d4 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc @@ -5,16 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ - file://0001-make-man-install-relative-to-DESTDIR.patch \ - file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0004-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0005-use-asm-sgidefs.h.patch \ - file://0006-Change-order-of-CFLAGS.patch \ - file://0007-resolve-restrict-keyword-conflict.patch \ - file://0008-Fix-invalid-sigprocmask-call.patch \ - file://0009-gdbserver-ctrl-c-handling.patch \ - file://readline-8.2.patch \ + 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 \ + file://0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch \ " -SRC_URI[sha256sum] = "0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed" +SRC_URI[sha256sum] = "115ad5c18d69a6be2ab15882d365dda2a2211c14f480b3502c6eba576e2e95a0" + +TOOLCHAIN = "gcc" diff --git a/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch deleted file mode 100644 index 16d6cf196f..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8eca28eddcda4ce8a345ca031f43ff1ed6f37089 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 2 Mar 2015 02:27:55 +0000 -Subject: [PATCH 1/9] make man install relative to DESTDIR - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - sim/common/Make-common.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in -index 74e5dad3049..9e95c224ba4 100644 ---- a/sim/common/Make-common.in -+++ b/sim/common/Make-common.in -@@ -70,7 +70,7 @@ tooldir = $(libdir)/$(target_alias) - datadir = @datadir@ - datarootdir = @datarootdir@ - mandir = @mandir@ --man1dir = $(mandir)/man1 -+man1dir = $(DESTDIR)$(mandir)/man1 - infodir = @infodir@ - includedir = @includedir@ - --- -2.36.1 - diff --git a/meta/recipes-devtools/gdb/gdb/0001-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 new file mode 100644 index 0000000000..55bdbf644c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch @@ -0,0 +1,32 @@ +From 73b71f0b85dd6c8181f2f11a427400d4870fabcc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 23 Mar 2016 06:30:09 +0000 +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 +only defined when GCC is using o32 ABI, in that +case gcc emits it as built-in define and hence +it works ok for mips32 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + gdb/mips-linux-nat.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index 972b5db8e76..5e68538a3ba 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -41,6 +41,10 @@ + #ifndef PTRACE_GET_THREAD_AREA + #define PTRACE_GET_THREAD_AREA 25 + #endif ++/* musl does not define and relies on compiler built-in macros for it */ ++#ifndef _ABIO32 ++#define _ABIO32 1 ++#endif + + class mips_linux_nat_target final : public linux_nat_trad_target + { diff --git a/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch deleted file mode 100644 index 8d263de896..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 37d3afd2eaa95c89ad7cb5d0079b017752e4d0ea Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 23 Mar 2016 06:30:09 +0000 -Subject: [PATCH 2/9] 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 -only defined when GCC is using o32 ABI, in that -case gcc emits it as built-in define and hence -it works ok for mips32 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - gdb/mips-linux-nat.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 20e12b6889e..6adc61235aa 100644 ---- a/gdb/mips-linux-nat.c -+++ b/gdb/mips-linux-nat.c -@@ -41,6 +41,10 @@ - #ifndef PTRACE_GET_THREAD_AREA - #define PTRACE_GET_THREAD_AREA 25 - #endif -+/* musl does not define and relies on compiler built-in macros for it */ -+#ifndef _ABIO32 -+#define _ABIO32 1 -+#endif - - class mips_linux_nat_target final : public linux_nat_trad_target - { --- -2.36.1 - diff --git a/meta/recipes-devtools/gdb/gdb/0002-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 new file mode 100644 index 0000000000..01e466f29b --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -0,0 +1,49 @@ +From e258cfb37d7c61b4a97e4ca8f1178485a3f91940 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Apr 2016 18:32:14 -0700 +Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + gdb/nat/ppc-linux.h | 6 ++++++ + gdbserver/linux-ppc-low.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h +index c84f9146bbd..8c8580c95e1 100644 +--- a/gdb/nat/ppc-linux.h ++++ b/gdb/nat/ppc-linux.h +@@ -18,7 +18,13 @@ + #ifndef NAT_PPC_LINUX_H + #define NAT_PPC_LINUX_H + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + #include + + /* This sometimes isn't defined. */ +diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc +index fdf74727e39..f64afd09b7a 100644 +--- a/gdbserver/linux-ppc-low.cc ++++ b/gdbserver/linux-ppc-low.cc +@@ -23,7 +23,13 @@ + #include "elf/common.h" + #include + #include ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include ++#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/0003-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 new file mode 100644 index 0000000000..5562461c75 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0003-Dont-disable-libreadline.a-when-using-disable-static.patch @@ -0,0 +1,47 @@ +From 431a88f4370a23b297998641e1e10ebfd74478d9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Apr 2016 15:25:03 -0700 +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 +tries to link against that. + +To ensure that readline always builds static libraries, pass --enable-static to +the sub-configure. + +Upstream-Status: Pending +Signed-off-by: Ross Burton +Signed-off-by: Khem Raj +--- + Makefile.def | 3 ++- + Makefile.in | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.def b/Makefile.def +index f974565d8ca..039b5a3c209 100644 +--- a/Makefile.def ++++ b/Makefile.def +@@ -120,7 +120,8 @@ host_modules= { module= libiconv; + missing= install-html; + missing= install-info; }; + host_modules= { module= m4; }; +-host_modules= { module= readline; }; ++host_modules= { module= readline; ++ extra_configure_flags='--enable-static';}; + host_modules= { module= sid; }; + host_modules= { module= sim; }; + host_modules= { module= texinfo; no_install= true; }; +diff --git a/Makefile.in b/Makefile.in +index a425b54e094..dfaf585a7c1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -32816,7 +32816,7 @@ configure-readline: + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ +- --target=${target_alias} \ ++ --target=${target_alias} --enable-static \ + || exit 1 + @endif readline + diff --git a/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch deleted file mode 100644 index 7e09404bb0..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e689eec672ee8c53b3adb2ade2b5deb9b7cd99d4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Apr 2016 18:32:14 -0700 -Subject: [PATCH 3/9] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - gdb/nat/ppc-linux.h | 6 ++++++ - gdbserver/linux-ppc-low.cc | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index 1094f6b0be3..d8588a646c2 100644 ---- a/gdb/nat/ppc-linux.h -+++ b/gdb/nat/ppc-linux.h -@@ -18,7 +18,13 @@ - #ifndef NAT_PPC_LINUX_H - #define NAT_PPC_LINUX_H - -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - #include - - /* This sometimes isn't defined. */ -diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc -index 08824887003..69afbae5359 100644 ---- a/gdbserver/linux-ppc-low.cc -+++ b/gdbserver/linux-ppc-low.cc -@@ -23,7 +23,13 @@ - #include "elf/common.h" - #include - #include -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - - #include "arch/ppc-linux-common.h" - #include "arch/ppc-linux-tdesc.h" --- -2.36.1 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0004-Dont-disable-libreadline.a-when-using-disable-static.patch deleted file mode 100644 index a1e85e91b3..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0004-Dont-disable-libreadline.a-when-using-disable-static.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 15ee6a626242efb8f367be49c13e00d0b72317f0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Apr 2016 15:25:03 -0700 -Subject: [PATCH 4/9] 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 -tries to link against that. - -To ensure that readline always builds static libraries, pass --enable-static to -the sub-configure. - -Upstream-Status: Pending -Signed-off-by: Ross Burton -Signed-off-by: Khem Raj ---- - Makefile.def | 3 ++- - Makefile.in | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile.def b/Makefile.def -index acdcd625ed6..78fc31e1199 100644 ---- a/Makefile.def -+++ b/Makefile.def -@@ -120,7 +120,8 @@ host_modules= { module= libiconv; - missing= install-html; - missing= install-info; }; - host_modules= { module= m4; }; --host_modules= { module= readline; }; -+host_modules= { module= readline; -+ extra_configure_flags='--enable-static';}; - host_modules= { module= sid; }; - host_modules= { module= sim; }; - host_modules= { module= texinfo; no_install= true; }; -diff --git a/Makefile.in b/Makefile.in -index 3aacd2daac9..aa58adada4a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -32791,7 +32791,7 @@ configure-readline: - $$s/$$module_srcdir/configure \ - --srcdir=$${topdir}/$$module_srcdir \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ -- --target=${target_alias} \ -+ --target=${target_alias} --enable-static \ - || exit 1 - @endif readline - --- -2.36.1 - diff --git a/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..d34c75ca61 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch @@ -0,0 +1,33 @@ +From 693e01865c28c0a48e60173389ef467f46244c21 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use + +Build fix for MIPS with musl libc + +The MIPS specific header is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide + which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +Signed-off-by: Andre McCurdy +Signed-off-by: Khem Raj +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index 5e68538a3ba..5b1c209abd8 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -31,7 +31,7 @@ + #include "gdb_proc_service.h" + #include "gregset.h" + +-#include ++#include + #include "nat/gdb_ptrace.h" + #include + #include "inf-ptrace.h" diff --git a/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch new file mode 100644 index 0000000000..3aaab8a8f1 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch @@ -0,0 +1,27 @@ +From 9e72a19355375e589032809dd2ec051b75d4db07 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Apr 2016 15:35:39 -0700 +Subject: [PATCH] Change order of CFLAGS + +Lets us override Werror if need be + +Upstream-Status: Inappropriate + +Signed-off-by: Khem Raj +--- + gdbserver/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in +index 040f0b6faa0..256ce6a3f6a 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. diff --git a/meta/recipes-devtools/gdb/gdb/0005-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0005-use-asm-sgidefs.h.patch deleted file mode 100644 index 242099b9b1..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0005-use-asm-sgidefs.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 25a75aaf29791f4302f0e4452f7ebaf735d4f083 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH 5/9] use - -Build fix for MIPS with musl libc - -The MIPS specific header is provided by glibc and uclibc -but not by musl. Regardless of the libc, the kernel headers provide - which provides the same definitions, so use that -instead. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy -Signed-off-by: Khem Raj ---- - gdb/mips-linux-nat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 6adc61235aa..afb40066744 100644 ---- a/gdb/mips-linux-nat.c -+++ b/gdb/mips-linux-nat.c -@@ -31,7 +31,7 @@ - #include "gdb_proc_service.h" - #include "gregset.h" - --#include -+#include - #include "nat/gdb_ptrace.h" - #include - #include "inf-ptrace.h" --- -2.36.1 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0006-Change-order-of-CFLAGS.patch deleted file mode 100644 index 58c9b1d0a7..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0006-Change-order-of-CFLAGS.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c0e7c34134aa1f9644075c596a2338a50d3d923e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Apr 2016 15:35:39 -0700 -Subject: [PATCH 6/9] Change order of CFLAGS - -Lets us override Werror if need be - -Upstream-Status: Inappropriate - -Signed-off-by: Khem Raj ---- - gdbserver/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in -index 47648b8d962..5599779de57 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.36.1 - diff --git a/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch new file mode 100644 index 0000000000..fe39c16877 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch @@ -0,0 +1,45 @@ +From 0ce96011d76ffa377349d0193dd0bf8f1bf641e0 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 10 May 2016 08:47:05 -0700 +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' +therefore we use __restrict to denote the C99 keywork + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + gnulib/import/sys_time.in.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +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 + _GL_FUNCDECL_RPL (gettimeofday, int, +- (struct timeval *restrict, void *restrict) ++ (struct timeval *__restrict, void *__restrict) + _GL_ARG_NONNULL ((1))); + _GL_CXXALIAS_RPL (gettimeofday, int, +- (struct timeval *restrict, void *restrict)); ++ (struct timeval *__restrict, void *__restrict)); + # else + # if !@HAVE_GETTIMEOFDAY@ + _GL_FUNCDECL_SYS (gettimeofday, int, +- (struct timeval *restrict, void *restrict) ++ (struct timeval *__restrict, void *__restrict) + _GL_ARG_NONNULL ((1))); + # endif + /* Need to cast, because on glibc systems, by default, the second argument is + struct timezone *. */ + _GL_CXXALIAS_SYS_CAST (gettimeofday, int, +- (struct timeval *restrict, void *restrict)); ++ (struct timeval *__restrict, void *__restrict)); + # endif + _GL_CXXALIASWARN (gettimeofday); + # if defined __cplusplus && defined GNULIB_NAMESPACE diff --git a/meta/recipes-devtools/gdb/gdb/0007-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0007-Fix-invalid-sigprocmask-call.patch new file mode 100644 index 0000000000..b095e92434 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0007-Fix-invalid-sigprocmask-call.patch @@ -0,0 +1,46 @@ +From 696891f6c5a1c6acab95dffd8c1d3a986ca71a18 Mon Sep 17 00:00:00 2001 +From: Yousong Zhou +Date: Fri, 24 Mar 2017 10:36:03 +0800 +Subject: [PATCH] Fix invalid sigprocmask call +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The POSIX document says + + The pthread_sigmask() and sigprocmask() functions shall fail if: + + [EINVAL] + The value of the how argument is not equal to one of the defined values. + +and this is how musl-libc is currently doing. Fix the call to be safe +and correct + + [1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_sigmask.html + +gdb/ChangeLog: +2017-03-24 Yousong Zhou + + * common/signals-state-save-restore.c (save_original_signals_state): + Fix invalid sigprocmask call. + +Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede-project.org/index.php?do=details&task_id=637&openedfrom=-1%2Bweek] +Signed-off-by: André Draszik +Signed-off-by: Khem Raj +--- + gdbsupport/signals-state-save-restore.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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 = gdb_sigmask (0, NULL, &original_signal_mask); ++ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); + if (res == -1) + perror_with_name (("sigprocmask")); + diff --git a/meta/recipes-devtools/gdb/gdb/0007-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0007-resolve-restrict-keyword-conflict.patch deleted file mode 100644 index bbd1f0b27f..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0007-resolve-restrict-keyword-conflict.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 44fa1ecfbd8a5fe0cfea12a175fa041686842a0c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 10 May 2016 08:47:05 -0700 -Subject: [PATCH 7/9] resolve restrict keyword conflict - -GCC detects that we call 'restrict' as param name in function -signatures and complains since both params are called 'restrict' -therefore we use __restrict to denote the C99 keywork - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - gnulib/import/sys_time.in.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h -index 90a67d18426..664641a1fe8 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 - _GL_FUNCDECL_RPL (gettimeofday, int, -- (struct timeval *restrict, void *restrict) -+ (struct timeval *__restrict, void *__restrict) - _GL_ARG_NONNULL ((1))); - _GL_CXXALIAS_RPL (gettimeofday, int, -- (struct timeval *restrict, void *restrict)); -+ (struct timeval *__restrict, void *__restrict)); - # else - # if !@HAVE_GETTIMEOFDAY@ - _GL_FUNCDECL_SYS (gettimeofday, int, -- (struct timeval *restrict, void *restrict) -+ (struct timeval *__restrict, void *__restrict) - _GL_ARG_NONNULL ((1))); - # endif - /* Need to cast, because on glibc systems, by default, the second argument is - struct timezone *. */ - _GL_CXXALIAS_SYS_CAST (gettimeofday, int, -- (struct timeval *restrict, void *restrict)); -+ (struct timeval *__restrict, void *__restrict)); - # endif - _GL_CXXALIASWARN (gettimeofday); - # if defined __cplusplus && defined GNULIB_NAMESPACE --- -2.36.1 - 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 index 3e29327613..566b910648 100644 --- 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 @@ -1,11 +1,11 @@ -From 48906e1038e469b429aa35d0f967730a929c3880 Mon Sep 17 00:00:00 2001 +From e649db1664af981cc87f966aef6c5365ae234547 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 15 Jan 2023 00:16:25 -0800 -Subject: [PATCH 8/8] Define alignof using _Alignof when using C11 or newer +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_slot to use builtin "_Alignof" to avoid undefined behavior on +alignof to use builtin "_Alignof" to avoid undefined behavior on when using std=c11 or newer clang 16+ has started to flag this [2] @@ -15,14 +15,10 @@ 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 -gnulib needs this fix and then it will be applied to downstream packages -like gdb [3] - [1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm [2] https://reviews.llvm.org/D133574 -[3] https://public-inbox.org/bug-gnulib/20230114232744.215167-1-raj.khem@gmail.com/T/#u -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d404c7dd974cc65f894526f4a1b76bc1dcd8d82] +Upstream-Status: Pending Signed-off-by: Khem Raj --- libiberty/sha1.c | 10 ++++++++++ @@ -50,6 +46,3 @@ index 504f06d3b9b..790ada82443 100644 # define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0) if (UNALIGNED_P (buffer)) while (len > 64) --- -2.39.0 - diff --git a/meta/recipes-devtools/gdb/gdb/0008-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0008-Fix-invalid-sigprocmask-call.patch deleted file mode 100644 index ed1310ced2..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0008-Fix-invalid-sigprocmask-call.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5bdd15553daef7370ca3c1f12d8f14247fdd4907 Mon Sep 17 00:00:00 2001 -From: Yousong Zhou -Date: Fri, 24 Mar 2017 10:36:03 +0800 -Subject: [PATCH 8/9] Fix invalid sigprocmask call -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The POSIX document says - - The pthread_sigmask() and sigprocmask() functions shall fail if: - - [EINVAL] - The value of the how argument is not equal to one of the defined values. - -and this is how musl-libc is currently doing. Fix the call to be safe -and correct - - [1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_sigmask.html - -gdb/ChangeLog: -2017-03-24 Yousong Zhou - - * common/signals-state-save-restore.c (save_original_signals_state): - Fix invalid sigprocmask call. - -Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede-project.org/index.php?do=details&task_id=637&openedfrom=-1%2Bweek] -Signed-off-by: André Draszik -Signed-off-by: Khem Raj ---- - gdbsupport/signals-state-save-restore.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdbsupport/signals-state-save-restore.cc b/gdbsupport/signals-state-save-restore.cc -index 92e799d3551..a4a0234272a 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 = gdb_sigmask (0, NULL, &original_signal_mask); -+ res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); - if (res == -1) - perror_with_name (("sigprocmask")); - --- -2.36.1 - diff --git a/meta/recipes-devtools/gdb/gdb/0009-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0009-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index f53d3bd1e5..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0009-gdbserver-ctrl-c-handling.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bc3b1f6aacf2d8fe66b022fbfcf28cd82c76e52f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Nov 2018 18:00:23 -0800 -Subject: [PATCH 9/9] gdbserver ctrl-c handling - -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 -Signed-off-by: Khem Raj ---- - gdbserver/linux-low.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc -index 7726a4a0c36..f750e074a03 100644 ---- a/gdbserver/linux-low.cc -+++ b/gdbserver/linux-low.cc -@@ -5496,7 +5496,7 @@ linux_process_target::request_interrupt () - { - /* 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); - } - - bool --- -2.36.1 - diff --git a/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch b/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch new file mode 100644 index 0000000000..32eba089bc --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0009-gdbserver-linux-low.cc-Fix-a-typo-in-ternary-operato.patch @@ -0,0 +1,24 @@ +From 9a85132c4ba7d37a5df146239b3ab1a5854ce478 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Feb 2023 16:24:07 -0800 +Subject: [PATCH] gdbserver/linux-low.cc: Fix a typo in ternary operator + +Upstream-Status: Submitted [https://sourceware.org/pipermail/gdb-patches/2023-February/197298.html] +Signed-off-by: Khem Raj +--- + gdbserver/linux-low.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc +index 7e1de397893..95ec871d436 100644 +--- a/gdbserver/linux-low.cc ++++ b/gdbserver/linux-low.cc +@@ -5390,7 +5390,7 @@ proc_xfer_memory (CORE_ADDR memaddr, unsigned char *readbuf, + if (lseek (fd, memaddr, SEEK_SET) != -1) + bytes = (readbuf != nullptr + ? read (fd, readbuf, len) +- ? write (fd, writebuf, len)); ++ : write (fd, writebuf, len)); + #endif + + if (bytes < 0) diff --git a/meta/recipes-devtools/gdb/gdb/readline-8.2.patch b/meta/recipes-devtools/gdb/gdb/readline-8.2.patch deleted file mode 100644 index c2db4c0d79..0000000000 --- a/meta/recipes-devtools/gdb/gdb/readline-8.2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Sun, 20 Mar 2022 14:01:54 +0100 -Subject: [PATCH] Add support for readline 8.2 - -In readline 8.2 the type of rl_completer_word_break_characters changed to -include const. - -Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=1add37b567a7dee39d99f37b37802034c3fce9c4] -Signed-off-by: Alexander Kanavin ---- - gdb/completer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gdb/completer.c b/gdb/completer.c -index d3900ae2014..a51c16ac7f8 100644 ---- a/gdb/completer.c -+++ b/gdb/completer.c -@@ -36,7 +36,7 @@ - calling a hook instead so we eliminate the CLI dependency. */ - #include "gdbcmd.h" - --/* Needed for rl_completer_word_break_characters() and for -+/* Needed for rl_completer_word_break_characters and for - rl_filename_completion_function. */ - #include "readline/readline.h" - -@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw () - rl_basic_quote_characters = NULL; - } - -- return rl_completer_word_break_characters; -+ return (char *) rl_completer_word_break_characters; - } - - char * --- -2.31.1 - diff --git a/meta/recipes-devtools/gdb/gdb_12.1.bb b/meta/recipes-devtools/gdb/gdb_12.1.bb deleted file mode 100644 index 9c6db4ca2c..0000000000 --- a/meta/recipes-devtools/gdb/gdb_12.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -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 - -inherit python3-dir - -EXTRA_OEMAKE:append:libc-musl = "\ - gt_cv_func_gnugettext1_libc=yes \ - gt_cv_func_gnugettext2_libc=yes \ - gl_cv_func_working_strerror=yes \ - gl_cv_func_strerror_0_works=yes \ - gl_cv_func_gettimeofday_clobber=no \ - " - -do_configure:prepend() { - if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then - cat > ${WORKDIR}/python << EOF -#!/bin/sh -case "\$2" in - --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;; - --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;; - --exec-prefix) echo "${exec_prefix}" ;; - *) exit 1 ;; -esac -exit 0 -EOF - chmod +x ${WORKDIR}/python - fi -} - diff --git a/meta/recipes-devtools/gdb/gdb_13.1.bb b/meta/recipes-devtools/gdb/gdb_13.1.bb new file mode 100644 index 0000000000..9c6db4ca2c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb_13.1.bb @@ -0,0 +1,39 @@ +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 + +inherit python3-dir + +EXTRA_OEMAKE:append:libc-musl = "\ + gt_cv_func_gnugettext1_libc=yes \ + gt_cv_func_gnugettext2_libc=yes \ + gl_cv_func_working_strerror=yes \ + gl_cv_func_strerror_0_works=yes \ + gl_cv_func_gettimeofday_clobber=no \ + " + +do_configure:prepend() { + if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then + cat > ${WORKDIR}/python << EOF +#!/bin/sh +case "\$2" in + --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;; + --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;; + --exec-prefix) echo "${exec_prefix}" ;; + *) exit 1 ;; +esac +exit 0 +EOF + chmod +x ${WORKDIR}/python + fi +} + -- cgit v1.2.3-54-g00ecf