diff options
Diffstat (limited to 'meta/recipes-devtools/gdb')
17 files changed, 235 insertions, 96 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc index ea1fc27a61..474cdf6514 100644 --- a/meta/recipes-devtools/gdb/gdb-common.inc +++ b/meta/recipes-devtools/gdb/gdb-common.inc | |||
@@ -30,9 +30,7 @@ EXTRA_OECONF = "--disable-gdbtk --disable-x --disable-werror \ | |||
30 | --with-libgmp-prefix=${STAGING_EXECPREFIXDIR} \ | 30 | --with-libgmp-prefix=${STAGING_EXECPREFIXDIR} \ |
31 | " | 31 | " |
32 | 32 | ||
33 | PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)} python \ | 33 | PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)} python xz" |
34 | ${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'xz', '', d)} \ | ||
35 | " | ||
36 | # Use --without-system-readline to compile with readline 5. | 34 | # Use --without-system-readline to compile with readline 5. |
37 | PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline" | 35 | PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline" |
38 | PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3-codecs" | 36 | PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3-codecs" |
@@ -40,6 +38,7 @@ PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" | |||
40 | PACKAGECONFIG[tui] = "--enable-tui,--disable-tui,,ncurses-terminfo-base" | 38 | PACKAGECONFIG[tui] = "--enable-tui,--disable-tui,,ncurses-terminfo-base" |
41 | PACKAGECONFIG[xz] = "--with-lzma --with-liblzma-prefix=${STAGING_DIR_HOST},--without-lzma,xz" | 39 | PACKAGECONFIG[xz] = "--with-lzma --with-liblzma-prefix=${STAGING_DIR_HOST},--without-lzma,xz" |
42 | PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils" | 40 | PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils" |
41 | PACKAGECONFIG[source-highlight] = "--enable-source-highlight,--disable-source-highlight,source-highlight" | ||
43 | 42 | ||
44 | GDBPROPREFIX = "--program-prefix=''" | 43 | GDBPROPREFIX = "--program-prefix=''" |
45 | 44 | ||
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index 058ffbc9c5..7b4a7719e4 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc | |||
@@ -7,18 +7,14 @@ PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" | |||
7 | BPN = "gdb" | 7 | BPN = "gdb" |
8 | 8 | ||
9 | DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-gmp nativesdk-mpfr \ | 9 | DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-gmp nativesdk-mpfr \ |
10 | virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc" | 10 | virtual/nativesdk-cross-cc virtual/nativesdk-cross-binutils virtual/nativesdk-libc" |
11 | 11 | ||
12 | GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" | 12 | GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" |
13 | 13 | ||
14 | # Overrides PACKAGECONFIG variables in gdb-common.inc | 14 | # Overrides PACKAGECONFIG variables in gdb-common.inc |
15 | PACKAGECONFIG ??= "python readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" | ||
16 | PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \ | 15 | PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \ |
17 | nativesdk-python3-core \ | 16 | nativesdk-python3-core \ |
18 | nativesdk-python3-codecs nativesdk-python3-netclient \ | 17 | nativesdk-python3-codecs nativesdk-python3-netclient" |
19 | " | ||
20 | PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline" | ||
21 | PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, nativesdk-elfutils" | ||
22 | 18 | ||
23 | SSTATE_ALLOW_OVERLAP_FILES += "${STAGING_DATADIR}/gdb" | 19 | SSTATE_ALLOW_OVERLAP_FILES += "${STAGING_DATADIR}/gdb" |
24 | 20 | ||
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_14.2.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_16.3.bb index 4ab2b7156d..4ab2b7156d 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_14.2.bb +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_16.3.bb | |||
diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc b/meta/recipes-devtools/gdb/gdb-cross.inc index 399f4bba97..110a536db7 100644 --- a/meta/recipes-devtools/gdb/gdb-cross.inc +++ b/meta/recipes-devtools/gdb/gdb-cross.inc | |||
@@ -4,11 +4,7 @@ DEPENDS = "expat-native gmp-native mpfr-native ncurses-native flex-native bison- | |||
4 | 4 | ||
5 | inherit python3native pkgconfig | 5 | inherit python3native pkgconfig |
6 | 6 | ||
7 | # Overrides PACKAGECONFIG variables in gdb-common.inc | ||
8 | PACKAGECONFIG ??= "python readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}" | ||
9 | PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-native" | 7 | PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-native" |
10 | PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native" | ||
11 | PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, elfutils-native" | ||
12 | 8 | ||
13 | do_compile:prepend() { | 9 | do_compile:prepend() { |
14 | export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}" | 10 | export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}" |
diff --git a/meta/recipes-devtools/gdb/gdb-cross_14.2.bb b/meta/recipes-devtools/gdb/gdb-cross_16.3.bb index 3b654a2f0d..3b654a2f0d 100644 --- a/meta/recipes-devtools/gdb/gdb-cross_14.2.bb +++ b/meta/recipes-devtools/gdb/gdb-cross_16.3.bb | |||
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 81ac441462..a36f78fe67 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc | |||
@@ -10,8 +10,9 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ | |||
10 | file://0003-Dont-disable-libreadline.a-when-using-disable-static.patch \ | 10 | file://0003-Dont-disable-libreadline.a-when-using-disable-static.patch \ |
11 | file://0004-use-asm-sgidefs.h.patch \ | 11 | file://0004-use-asm-sgidefs.h.patch \ |
12 | file://0005-Change-order-of-CFLAGS.patch \ | 12 | file://0005-Change-order-of-CFLAGS.patch \ |
13 | file://0006-resolve-restrict-keyword-conflict.patch \ | 13 | file://0006-Fix-invalid-sigprocmask-call.patch \ |
14 | file://0007-Fix-invalid-sigprocmask-call.patch \ | 14 | file://0007-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ |
15 | file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ | 15 | file://0008-Add-fix-for-packages-that-are-not-compatible-with-C2.patch \ |
16 | file://0009-Readline-8.3-alpha-release.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI[sha256sum] = "2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772" | 18 | SRC_URI[sha256sum] = "bcfcd095528a987917acf9fff3f1672181694926cc18d609c99d0042c00224c5" |
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 index 86f6e2642d..7a3064a14b 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From ff77aebf533758f0b6f7d22b272d32e08ed06e45 Mon Sep 17 00:00:00 2001 | 1 | From 8448967d9cfb09eb11fd3573a72a35ae94a89ba1 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 23 Mar 2016 06:30:09 +0000 | 3 | Date: Wed, 23 Mar 2016 06:30:09 +0000 |
4 | Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined | 4 | Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined |
@@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
16 | 1 file changed, 4 insertions(+) | 16 | 1 file changed, 4 insertions(+) |
17 | 17 | ||
18 | diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c | 18 | diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c |
19 | index 8a7cc95f2a4..bfd1c72cba6 100644 | 19 | index 3d072ea935c..ca38caeacc2 100644 |
20 | --- a/gdb/mips-linux-nat.c | 20 | --- a/gdb/mips-linux-nat.c |
21 | +++ b/gdb/mips-linux-nat.c | 21 | +++ b/gdb/mips-linux-nat.c |
22 | @@ -41,6 +41,10 @@ | 22 | @@ -40,6 +40,10 @@ |
23 | #ifndef PTRACE_GET_THREAD_AREA | 23 | #ifndef PTRACE_GET_THREAD_AREA |
24 | #define PTRACE_GET_THREAD_AREA 25 | 24 | #define PTRACE_GET_THREAD_AREA 25 |
25 | #endif | 25 | #endif |
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 index 897cfd0df9..56cbacf384 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 78748dc55b1ceafe9a64beb9628f1d51b215482f Mon Sep 17 00:00:00 2001 | 1 | From ec49e6283bc6a4a99596410db9509bee6cd941ce Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 30 Apr 2016 18:32:14 -0700 | 3 | Date: Sat, 30 Apr 2016 18:32:14 -0700 |
4 | Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems | 4 | Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems |
@@ -12,12 +12,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 2 files changed, 12 insertions(+) | 12 | 2 files changed, 12 insertions(+) |
13 | 13 | ||
14 | diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h | 14 | diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h |
15 | index c84f9146bbd..8c8580c95e1 100644 | 15 | index 3efc1b9a9bf..635d07486de 100644 |
16 | --- a/gdb/nat/ppc-linux.h | 16 | --- a/gdb/nat/ppc-linux.h |
17 | +++ b/gdb/nat/ppc-linux.h | 17 | +++ b/gdb/nat/ppc-linux.h |
18 | @@ -18,7 +18,13 @@ | 18 | @@ -18,7 +18,13 @@ |
19 | #ifndef NAT_PPC_LINUX_H | 19 | #ifndef GDB_NAT_PPC_LINUX_H |
20 | #define NAT_PPC_LINUX_H | 20 | #define GDB_NAT_PPC_LINUX_H |
21 | 21 | ||
22 | +#if !defined(__GLIBC__) | 22 | +#if !defined(__GLIBC__) |
23 | +# define pt_regs uapi_pt_regs | 23 | +# define pt_regs uapi_pt_regs |
@@ -30,10 +30,10 @@ index c84f9146bbd..8c8580c95e1 100644 | |||
30 | 30 | ||
31 | /* This sometimes isn't defined. */ | 31 | /* This sometimes isn't defined. */ |
32 | diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc | 32 | diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc |
33 | index 86fbc8f5d96..8a1a39bc750 100644 | 33 | index 3ce978f4c7c..38534297cdf 100644 |
34 | --- a/gdbserver/linux-ppc-low.cc | 34 | --- a/gdbserver/linux-ppc-low.cc |
35 | +++ b/gdbserver/linux-ppc-low.cc | 35 | +++ b/gdbserver/linux-ppc-low.cc |
36 | @@ -23,7 +23,13 @@ | 36 | @@ -22,7 +22,13 @@ |
37 | #include "elf/common.h" | 37 | #include "elf/common.h" |
38 | #include <sys/uio.h> | 38 | #include <sys/uio.h> |
39 | #include <elf.h> | 39 | #include <elf.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 index e41be8209e..024cf34427 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 683650564cd231bbf09c7cbc35543b77ca0b10d0 Mon Sep 17 00:00:00 2001 | 1 | From 2fa91dec5f0ec5663861ca53bde8951e48557bb3 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 30 Apr 2016 15:25:03 -0700 | 3 | Date: Sat, 30 Apr 2016 15:25:03 -0700 |
4 | Subject: [PATCH] Dont disable libreadline.a when using --disable-static | 4 | Subject: [PATCH] Dont disable libreadline.a when using --disable-static |
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
19 | 2 files changed, 3 insertions(+), 2 deletions(-) | 19 | 2 files changed, 3 insertions(+), 2 deletions(-) |
20 | 20 | ||
21 | diff --git a/Makefile.def b/Makefile.def | 21 | diff --git a/Makefile.def b/Makefile.def |
22 | index 870150183b9..eb3788da0d2 100644 | 22 | index 4896c5c692c..17e3256be7d 100644 |
23 | --- a/Makefile.def | 23 | --- a/Makefile.def |
24 | +++ b/Makefile.def | 24 | +++ b/Makefile.def |
25 | @@ -119,7 +119,8 @@ host_modules= { module= libiconv; | 25 | @@ -134,7 +134,8 @@ host_modules= { module= libiconv; |
26 | missing= install-html; | 26 | missing= install-html; |
27 | missing= install-info; }; | 27 | missing= install-info; }; |
28 | host_modules= { module= m4; }; | 28 | host_modules= { module= m4; }; |
@@ -33,10 +33,10 @@ index 870150183b9..eb3788da0d2 100644 | |||
33 | host_modules= { module= sim; }; | 33 | host_modules= { module= sim; }; |
34 | host_modules= { module= texinfo; no_install= true; }; | 34 | host_modules= { module= texinfo; no_install= true; }; |
35 | diff --git a/Makefile.in b/Makefile.in | 35 | diff --git a/Makefile.in b/Makefile.in |
36 | index c97130a2338..a83f98e4778 100644 | 36 | index f12c251f9c8..17ea24e8012 100644 |
37 | --- a/Makefile.in | 37 | --- a/Makefile.in |
38 | +++ b/Makefile.in | 38 | +++ b/Makefile.in |
39 | @@ -31691,7 +31691,7 @@ configure-readline: | 39 | @@ -31593,7 +31593,7 @@ configure-readline: |
40 | $$s/$$module_srcdir/configure \ | 40 | $$s/$$module_srcdir/configure \ |
41 | --srcdir=$${topdir}/$$module_srcdir \ | 41 | --srcdir=$${topdir}/$$module_srcdir \ |
42 | $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ | 42 | $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ |
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 index 413610d71f..556f371fee 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-use-asm-sgidefs.h.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 04eba78ea6bd167b7eeef3af668c8f49888dc688 Mon Sep 17 00:00:00 2001 | 1 | From 6d37100388d45185a6e88ea7099a698c2c76b084 Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <amccurdy@gmail.com> | 2 | From: Andre McCurdy <amccurdy@gmail.com> |
3 | Date: Sat, 30 Apr 2016 15:29:06 -0700 | 3 | Date: Sat, 30 Apr 2016 15:29:06 -0700 |
4 | Subject: [PATCH] use <asm/sgidefs.h> | 4 | Subject: [PATCH] use <asm/sgidefs.h> |
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c | 21 | diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c |
22 | index bfd1c72cba6..13dc9cdb703 100644 | 22 | index ca38caeacc2..2f044ca508a 100644 |
23 | --- a/gdb/mips-linux-nat.c | 23 | --- a/gdb/mips-linux-nat.c |
24 | +++ b/gdb/mips-linux-nat.c | 24 | +++ b/gdb/mips-linux-nat.c |
25 | @@ -31,7 +31,7 @@ | 25 | @@ -30,7 +30,7 @@ |
26 | #include "gdb_proc_service.h" | 26 | #include "gdb_proc_service.h" |
27 | #include "gregset.h" | 27 | #include "gregset.h" |
28 | 28 | ||
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 index 7631e75048..809cd232aa 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Change-order-of-CFLAGS.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e7041e9346aa0c3aee0b76315559e3ab2ef8977e Mon Sep 17 00:00:00 2001 | 1 | From e7cab417080f3454ea984e19384d9f1bf9e48fba Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 30 Apr 2016 15:35:39 -0700 | 3 | Date: Sat, 30 Apr 2016 15:35:39 -0700 |
4 | Subject: [PATCH] Change order of CFLAGS | 4 | Subject: [PATCH] Change order of CFLAGS |
@@ -9,19 +9,18 @@ Upstream-Status: Inappropriate | |||
9 | 9 | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | --- | 11 | --- |
12 | gdbserver/Makefile.in | 2 +- | 12 | gdbserver/Makefile.in | 1 + |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+) |
14 | 14 | ||
15 | diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in | 15 | diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in |
16 | index b597515d428..9e615e2842d 100644 | 16 | index 365dcf23650..fc16218334f 100644 |
17 | --- a/gdbserver/Makefile.in | 17 | --- a/gdbserver/Makefile.in |
18 | +++ b/gdbserver/Makefile.in | 18 | +++ b/gdbserver/Makefile.in |
19 | @@ -156,7 +156,7 @@ WIN32APILIBS = @WIN32APILIBS@ | 19 | @@ -174,6 +174,7 @@ INTERNAL_CFLAGS = \ |
20 | INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \ | 20 | $(PTHREAD_CFLAGS) \ |
21 | ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) | 21 | $(WARN_CFLAGS) \ |
22 | INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) | 22 | $(WERROR_CFLAGS) \ |
23 | -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER | 23 | + ${COMPILER_CFLAGS} \ |
24 | +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER | 24 | -DGDBSERVER |
25 | 25 | ||
26 | # LDFLAGS is specifically reserved for setting from the command line | 26 | # LDFLAGS is specifically reserved for setting from the command line |
27 | # when running make. | ||
diff --git a/meta/recipes-devtools/gdb/gdb/0007-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0006-Fix-invalid-sigprocmask-call.patch index 26e3ad9098..7c9129b9f5 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-Fix-invalid-sigprocmask-call.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ebeb6125acf6b4e4a8a4eaa59e2830b9ca02d683 Mon Sep 17 00:00:00 2001 | 1 | From 13e61d515b74389e61fa52ca43656f9d1c294683 Mon Sep 17 00:00:00 2001 |
2 | From: Yousong Zhou <yszhou4tech@gmail.com> | 2 | From: Yousong Zhou <yszhou4tech@gmail.com> |
3 | Date: Fri, 24 Mar 2017 10:36:03 +0800 | 3 | Date: Fri, 24 Mar 2017 10:36:03 +0800 |
4 | Subject: [PATCH] Fix invalid sigprocmask call | 4 | Subject: [PATCH] Fix invalid sigprocmask call |
@@ -32,10 +32,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
32 | 1 file changed, 1 insertion(+), 1 deletion(-) | 32 | 1 file changed, 1 insertion(+), 1 deletion(-) |
33 | 33 | ||
34 | diff --git a/gdbsupport/signals-state-save-restore.cc b/gdbsupport/signals-state-save-restore.cc | 34 | diff --git a/gdbsupport/signals-state-save-restore.cc b/gdbsupport/signals-state-save-restore.cc |
35 | index 3ec7a259c9c..0702eca7725 100644 | 35 | index 60724f95c87..8b493271aa6 100644 |
36 | --- a/gdbsupport/signals-state-save-restore.cc | 36 | --- a/gdbsupport/signals-state-save-restore.cc |
37 | +++ b/gdbsupport/signals-state-save-restore.cc | 37 | +++ b/gdbsupport/signals-state-save-restore.cc |
38 | @@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) | 38 | @@ -37,7 +37,7 @@ save_original_signals_state (bool quiet) |
39 | int i; | 39 | int i; |
40 | int res; | 40 | int res; |
41 | 41 | ||
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 deleted file mode 100644 index 45388c5ac5..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 477f1b2049c7f940b8e8fda4ac396cfe322b269f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 10 May 2016 08:47:05 -0700 | ||
4 | Subject: [PATCH] resolve restrict keyword conflict | ||
5 | |||
6 | GCC detects that we call 'restrict' as param name in function | ||
7 | signatures and complains since both params are called 'restrict' | ||
8 | therefore we use __restrict to denote the C99 keywork | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | gnulib/import/sys_time.in.h | 8 ++++---- | ||
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h | ||
18 | index 87db1a88745..e6b98c7e467 100644 | ||
19 | --- a/gnulib/import/sys_time.in.h | ||
20 | +++ b/gnulib/import/sys_time.in.h | ||
21 | @@ -93,20 +93,20 @@ struct timeval | ||
22 | # define gettimeofday rpl_gettimeofday | ||
23 | # endif | ||
24 | _GL_FUNCDECL_RPL (gettimeofday, int, | ||
25 | - (struct timeval *restrict, void *restrict) | ||
26 | + (struct timeval *__restrict, void *__restrict) | ||
27 | _GL_ARG_NONNULL ((1))); | ||
28 | _GL_CXXALIAS_RPL (gettimeofday, int, | ||
29 | - (struct timeval *restrict, void *restrict)); | ||
30 | + (struct timeval *__restrict, void *__restrict)); | ||
31 | # else | ||
32 | # if !@HAVE_GETTIMEOFDAY@ | ||
33 | _GL_FUNCDECL_SYS (gettimeofday, int, | ||
34 | - (struct timeval *restrict, void *restrict) | ||
35 | + (struct timeval *__restrict, void *__restrict) | ||
36 | _GL_ARG_NONNULL ((1))); | ||
37 | # endif | ||
38 | /* Need to cast, because on glibc systems, by default, the second argument is | ||
39 | struct timezone *. */ | ||
40 | _GL_CXXALIAS_SYS_CAST (gettimeofday, int, | ||
41 | - (struct timeval *restrict, void *restrict)); | ||
42 | + (struct timeval *__restrict, void *__restrict)); | ||
43 | # endif | ||
44 | _GL_CXXALIASWARN (gettimeofday); | ||
45 | # if defined __cplusplus && defined GNULIB_NAMESPACE | ||
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/0007-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch index 819f1c9f17..d8816e3bef 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cb7c8df338184d2d2f31ee1fd238653e3162da44 Mon Sep 17 00:00:00 2001 | 1 | From 3d3d91ac1db8ee7f624d225734cb5b57b752e00b Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 15 Jan 2023 00:16:25 -0800 | 3 | Date: Sun, 15 Jan 2023 00:16:25 -0800 |
4 | Subject: [PATCH] Define alignof using _Alignof when using C11 or newer | 4 | Subject: [PATCH] Define alignof using _Alignof when using C11 or newer |
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
25 | 1 file changed, 10 insertions(+) | 25 | 1 file changed, 10 insertions(+) |
26 | 26 | ||
27 | diff --git a/libiberty/sha1.c b/libiberty/sha1.c | 27 | diff --git a/libiberty/sha1.c b/libiberty/sha1.c |
28 | index 6c71e3ebb41..a2caf947d31 100644 | 28 | index 49e8e0b6c2b..72de5cc8ad6 100644 |
29 | --- a/libiberty/sha1.c | 29 | --- a/libiberty/sha1.c |
30 | +++ b/libiberty/sha1.c | 30 | +++ b/libiberty/sha1.c |
31 | @@ -229,7 +229,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) | 31 | @@ -234,7 +234,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) |
32 | if (len >= 64) | 32 | if (len >= 64) |
33 | { | 33 | { |
34 | #if !_STRING_ARCH_unaligned | 34 | #if !_STRING_ARCH_unaligned |
diff --git a/meta/recipes-devtools/gdb/gdb/0008-Add-fix-for-packages-that-are-not-compatible-with-C2.patch b/meta/recipes-devtools/gdb/gdb/0008-Add-fix-for-packages-that-are-not-compatible-with-C2.patch new file mode 100644 index 0000000000..661eb261c2 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0008-Add-fix-for-packages-that-are-not-compatible-with-C2.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From f71cfa9db1a196f0fadb2090ac04ce3164e171d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 16 Mar 2025 12:48:46 -0700 | ||
4 | Subject: [PATCH] Add fix for packages that are not compatible with C23 | ||
5 | |||
6 | Fixes builds with GCC-15 | ||
7 | Sourced from Fedora: https://src.fedoraproject.org/rpms/readline/c/c47eb813afb942128253213ad5b8221770557e48?branch=rawhide | ||
8 | |||
9 | Help getting packages like bluez5 building | ||
10 | |||
11 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-readline/2025-03/msg00001.html] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | readline/readline/rlstdc.h | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/readline/readline/rlstdc.h b/readline/readline/rlstdc.h | ||
18 | index 2aaa30babfb..a7a0ef30428 100644 | ||
19 | --- a/readline/readline/rlstdc.h | ||
20 | +++ b/readline/readline/rlstdc.h | ||
21 | @@ -44,7 +44,7 @@ | ||
22 | |||
23 | /* Moved from config.h.in because readline.h:rl_message depends on these | ||
24 | defines. */ | ||
25 | -#if defined (__STDC__) && defined (HAVE_STDARG_H) | ||
26 | +#if defined (__STDC__) | ||
27 | # define PREFER_STDARG | ||
28 | # define USE_VARARGS | ||
29 | #else | ||
diff --git a/meta/recipes-devtools/gdb/gdb/0009-Readline-8.3-alpha-release.patch b/meta/recipes-devtools/gdb/gdb/0009-Readline-8.3-alpha-release.patch new file mode 100644 index 0000000000..206b4baaf0 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0009-Readline-8.3-alpha-release.patch | |||
@@ -0,0 +1,164 @@ | |||
1 | From 8807681557d9f30aac819186369ee62f4f8d1d96 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chet Ramey <chet.ramey@case.edu> | ||
3 | Date: Mon, 22 Apr 2024 10:41:37 -0400 | ||
4 | Subject: [PATCH] Readline-8.3-alpha release | ||
5 | |||
6 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/readline.git/commit/tcap.h?h=readline-8.3-testing&id=69e5c5e4c9778bf86c3d1c6b058ddece70854de8] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | ...ap-Add-function-parameter-prototypes.patch | 37 ++++++++++ | ||
10 | ...d=cef614441f99b7b6e444ba601d8465a6e88f5a98 | 67 +++++++++++++++++++ | ||
11 | readline/readline/tcap.h | 14 ++-- | ||
12 | 3 files changed, 111 insertions(+), 7 deletions(-) | ||
13 | create mode 100644 readline/readline/0001-tcap-Add-function-parameter-prototypes.patch | ||
14 | create mode 100644 readline/readline/index.html?id=cef614441f99b7b6e444ba601d8465a6e88f5a98 | ||
15 | |||
16 | diff --git a/readline/readline/0001-tcap-Add-function-parameter-prototypes.patch b/readline/readline/0001-tcap-Add-function-parameter-prototypes.patch | ||
17 | new file mode 100644 | ||
18 | index 00000000000..f28e31fd0e0 | ||
19 | --- /dev/null | ||
20 | +++ b/readline/readline/0001-tcap-Add-function-parameter-prototypes.patch | ||
21 | @@ -0,0 +1,37 @@ | ||
22 | +From 0c16af6ebf0bf81138c973e5e6a7c4ebf71f2489 Mon Sep 17 00:00:00 2001 | ||
23 | +From: Khem Raj <raj.khem@gmail.com> | ||
24 | +Date: Wed, 30 Apr 2025 10:41:12 -0700 | ||
25 | +Subject: [PATCH] tcap: Add function parameter prototypes | ||
26 | + | ||
27 | +GCC-15 with C23 dilect defaults expects full function signature | ||
28 | + | ||
29 | +Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
30 | +--- | ||
31 | + readline/readline/tcap.h | 14 ++++++-------- | ||
32 | + 1 file changed, 6 insertions(+), 8 deletions(-) | ||
33 | + | ||
34 | +diff --git a/readline/readline/tcap.h b/readline/readline/tcap.h | ||
35 | +index 859e6ee..2b22ff7 100644 | ||
36 | +--- a/readline/readline/tcap.h | ||
37 | ++++ b/readline/readline/tcap.h | ||
38 | +@@ -46,14 +46,12 @@ extern char *UP, *BC; | ||
39 | + | ||
40 | + extern short ospeed; | ||
41 | + | ||
42 | +-extern int tgetent (); | ||
43 | +-extern int tgetflag (); | ||
44 | +-extern int tgetnum (); | ||
45 | +-extern char *tgetstr (); | ||
46 | +- | ||
47 | +-extern int tputs (); | ||
48 | +- | ||
49 | +-extern char *tgoto (); | ||
50 | ++extern int tgetent(char*, const char*); | ||
51 | ++extern int tgetflag(const char*); | ||
52 | ++extern int tgetnum(const char*); | ||
53 | ++extern char *tgetstr(const char*, char**); | ||
54 | ++extern char *tgoto(const char*, int, int); | ||
55 | ++extern int tputs(const char*, int, int (*)(int)); | ||
56 | + | ||
57 | + #endif /* HAVE_TERMCAP_H */ | ||
58 | + | ||
59 | diff --git a/readline/readline/index.html?id=cef614441f99b7b6e444ba601d8465a6e88f5a98 b/readline/readline/index.html?id=cef614441f99b7b6e444ba601d8465a6e88f5a98 | ||
60 | new file mode 100644 | ||
61 | index 00000000000..02e665b143b | ||
62 | --- /dev/null | ||
63 | +++ b/readline/readline/index.html?id=cef614441f99b7b6e444ba601d8465a6e88f5a98 | ||
64 | @@ -0,0 +1,67 @@ | ||
65 | +From cef614441f99b7b6e444ba601d8465a6e88f5a98 Mon Sep 17 00:00:00 2001 | ||
66 | +From: Chet Ramey <chet.ramey@case.edu> | ||
67 | +Date: Sun, 14 Jan 2024 15:19:37 -0500 | ||
68 | +Subject: Readline-8.2 patch 8: add missing function prototypes | ||
69 | + | ||
70 | +--- | ||
71 | + bind.c | 4 +--- | ||
72 | + patchlevel | 2 +- | ||
73 | + rltty.c | 3 +-- | ||
74 | + text.c | 3 +-- | ||
75 | + 4 files changed, 4 insertions(+), 8 deletions(-) | ||
76 | + | ||
77 | +diff --git a/bind.c b/bind.c | ||
78 | +index 971116a..2596006 100644 | ||
79 | +--- a/bind.c | ||
80 | ++++ b/bind.c | ||
81 | +@@ -1167,9 +1167,7 @@ _rl_init_file_error (va_alist) | ||
82 | + /* **************************************************************** */ | ||
83 | + | ||
84 | + static int | ||
85 | +-parse_comparison_op (s, indp) | ||
86 | +- const char *s; | ||
87 | +- int *indp; | ||
88 | ++parse_comparison_op (const char *s, int *indp) | ||
89 | + { | ||
90 | + int i, peekc, op; | ||
91 | + | ||
92 | +diff --git a/patchlevel b/patchlevel | ||
93 | +index e340b58..6c10f12 100644 | ||
94 | +--- a/patchlevel | ||
95 | ++++ b/patchlevel | ||
96 | +@@ -1,3 +1,3 @@ | ||
97 | + # Do not edit -- exists only for use by patch | ||
98 | + | ||
99 | +-7 | ||
100 | ++8 | ||
101 | +diff --git a/rltty.c b/rltty.c | ||
102 | +index 882a3d4..a4863ac 100644 | ||
103 | +--- a/rltty.c | ||
104 | ++++ b/rltty.c | ||
105 | +@@ -80,8 +80,7 @@ static int ksrflow; | ||
106 | + /* Dummy call to force a backgrounded readline to stop before it tries | ||
107 | + to get the tty settings. */ | ||
108 | + static void | ||
109 | +-set_winsize (tty) | ||
110 | +- int tty; | ||
111 | ++set_winsize (int tty) | ||
112 | + { | ||
113 | + #if defined (TIOCGWINSZ) | ||
114 | + struct winsize w; | ||
115 | +diff --git a/text.c b/text.c | ||
116 | +index 91c3f33..30fdaa1 100644 | ||
117 | +--- a/text.c | ||
118 | ++++ b/text.c | ||
119 | +@@ -1764,8 +1764,7 @@ _rl_char_search (int count, int fdir, int bdir) | ||
120 | + | ||
121 | + #if defined (READLINE_CALLBACKS) | ||
122 | + static int | ||
123 | +-_rl_char_search_callback (data) | ||
124 | +- _rl_callback_generic_arg *data; | ||
125 | ++_rl_char_search_callback (_rl_callback_generic_arg *data) | ||
126 | + { | ||
127 | + _rl_callback_func = 0; | ||
128 | + _rl_want_redisplay = 1; | ||
129 | +-- | ||
130 | +cgit v1.1 | ||
131 | + | ||
132 | diff --git a/readline/readline/tcap.h b/readline/readline/tcap.h | ||
133 | index 859e6eed5aa..467ea60e903 100644 | ||
134 | --- a/readline/readline/tcap.h | ||
135 | +++ b/readline/readline/tcap.h | ||
136 | @@ -1,6 +1,6 @@ | ||
137 | /* tcap.h -- termcap library functions and variables. */ | ||
138 | |||
139 | -/* Copyright (C) 1996-2015 Free Software Foundation, Inc. | ||
140 | +/* Copyright (C) 1996-2015,2023 Free Software Foundation, Inc. | ||
141 | |||
142 | This file is part of the GNU Readline Library (Readline), a library | ||
143 | for reading lines of text with interactive input and history editing. | ||
144 | @@ -46,14 +46,14 @@ extern char *UP, *BC; | ||
145 | |||
146 | extern short ospeed; | ||
147 | |||
148 | -extern int tgetent (); | ||
149 | -extern int tgetflag (); | ||
150 | -extern int tgetnum (); | ||
151 | -extern char *tgetstr (); | ||
152 | +extern int tgetent (char *, const char *); | ||
153 | +extern int tgetflag (const char *); | ||
154 | +extern int tgetnum (const char *); | ||
155 | +extern char *tgetstr (const char *, char **); | ||
156 | |||
157 | -extern int tputs (); | ||
158 | +extern int tputs (const char *, int, int (*)(int)); | ||
159 | |||
160 | -extern char *tgoto (); | ||
161 | +extern char *tgoto (const char *, int, int); | ||
162 | |||
163 | #endif /* HAVE_TERMCAP_H */ | ||
164 | |||
diff --git a/meta/recipes-devtools/gdb/gdb_14.2.bb b/meta/recipes-devtools/gdb/gdb_16.3.bb index 9c6db4ca2c..9c6db4ca2c 100644 --- a/meta/recipes-devtools/gdb/gdb_14.2.bb +++ b/meta/recipes-devtools/gdb/gdb_16.3.bb | |||