summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/gdb/Makefile8
-rw-r--r--package/gdb/patches/patch-gdb_configure96
-rw-r--r--package/gdb/patches/patch-gdb_riscv-tdep_c12
-rw-r--r--package/gdbserver/Makefile7
-rw-r--r--target/config/Config.in.gdb6
-rw-r--r--toolchain/gdb/Makefile1
-rw-r--r--toolchain/gdb/Makefile.inc6
7 files changed, 15 insertions, 121 deletions
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 16ec9c66d..1bb3920a8 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -4,14 +4,14 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= gdb
-PKG_VERSION:= 10.1
+PKG_VERSION:= 11.1
PKG_RELEASE:= 1
-PKG_HASH:= f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
+PKG_HASH:= cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
PKG_DESCR:= program debugger
PKG_SECTION:= app/debug
PKG_SITES:= ${MASTER_SITE_GNU:=gdb/}
-PKG_DEPENDS:= libncurses zlib libexpat libthread-db
-PKG_BUILDDEP:= ncurses readline expat zlib
+PKG_DEPENDS:= libncurses libreadline zlib libexpat libthread-db libgmp
+PKG_BUILDDEP:= ncurses readline expat zlib gmp
PKG_NEEDS:= c++
PKG_ARCH_DEPENDS:= !cris !avr32 !microblaze
diff --git a/package/gdb/patches/patch-gdb_configure b/package/gdb/patches/patch-gdb_configure
deleted file mode 100644
index 932db7d01..000000000
--- a/package/gdb/patches/patch-gdb_configure
+++ /dev/null
@@ -1,96 +0,0 @@
---- gdb-8.3.1.orig/gdb/configure 2019-09-21 00:04:41.000000000 +0200
-+++ gdb-8.3.1/gdb/configure 2019-10-16 12:08:42.152038996 +0200
-@@ -15064,93 +15064,6 @@ $as_echo "$gdb_cv_bigtoc" >&6; }
- ;;
- esac
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the dynamic export flag" >&5
--$as_echo_n "checking for the dynamic export flag... " >&6; }
--dynamic_list=false
--if test "${gdb_native}" = yes; then
-- # The dynamically loaded libthread_db needs access to symbols in the gdb
-- # executable. Older GNU ld supports --export-dynamic but --dynamic-list
-- # may not be supported there.
-- old_LDFLAGS="$LDFLAGS"
-- # Older GNU ld supports --export-dynamic but --dynamic-list it does not.
-- RDYNAMIC="-Wl,--dynamic-list=${srcdir}/proc-service.list"
-- LDFLAGS="$LDFLAGS $RDYNAMIC"
-- if test "${have_libpython}" = no; then
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
-- dynamic_list=true
--fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- else
-- # Workaround http://bugs.python.org/issue4434 where static
-- # libpythonX.Y.a would get its symbols required for
-- # pythonX.Y/lib-dynload/*.so modules hidden by -Wl,--dynamic-list.
-- # Problem does not happen for the recommended libpythonX.Y.so linkage.
--
-- # Note the workaround for Python
-- # http://bugs.python.org/issue10112 earlier has removed
-- # -export-dynamic from PYTHON_LIBS. That's exactly what we want
-- # here too, as otherwise it'd make this -Wl,--dynamic-list test
-- # always pass.
-- old_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS $PYTHON_CFLAGS"
-- old_LIBS="$LIBS"
-- LIBS="$LIBS $PYTHON_LIBS"
-- old_CPPFLAGS="$CPPFLAGS"
-- CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
-- if test "$cross_compiling" = yes; then :
-- true
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--#include "Python.h"
--int
--main ()
--{
--int err;
-- Py_Initialize ();
-- err = PyRun_SimpleString ("import itertools\n");
-- Py_Finalize ();
-- return err == 0 ? 0 : 1;
-- ;
-- return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-- dynamic_list=true
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
-- LIBS="$old_LIBS"
-- CFLAGS="$old_CFLAGS"
-- CPPFLAGS="$old_CPPFLAGS"
-- fi
-- LDFLAGS="$old_LDFLAGS"
--fi
--if $dynamic_list; then
-- found="-Wl,--dynamic-list"
-- RDYNAMIC='-Wl,--dynamic-list=$(srcdir)/proc-service.list'
--else
-- found="-rdynamic"
-- RDYNAMIC="-rdynamic"
--fi
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found" >&5
--$as_echo "$found" >&6; }
--
-
- if test ${build} = ${host} -a ${host} = ${target} ; then
- case ${host_os} in
diff --git a/package/gdb/patches/patch-gdb_riscv-tdep_c b/package/gdb/patches/patch-gdb_riscv-tdep_c
deleted file mode 100644
index 17834f821..000000000
--- a/package/gdb/patches/patch-gdb_riscv-tdep_c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gdb-8.3.1.orig/gdb/riscv-tdep.c 2019-09-21 00:04:41.000000000 +0200
-+++ gdb-8.3.1/gdb/riscv-tdep.c 2019-10-16 12:18:34.569267544 +0200
-@@ -3131,9 +3131,6 @@ riscv_gdbarch_init (struct gdbarch_info
- /* We do support running binaries compiled for 32-bit float on targets
- with 64-bit float, so we only complain if the binary requires more
- than the target has available. */
-- if (abi_features.flen > features.flen)
-- error (_("bfd requires flen %d, but target has flen %d"),
-- abi_features.flen, features.flen);
-
- /* If the ABI_FEATURES xlen is 0 then this indicates we got no useful abi
- features from the INFO object. In this case we assume that the xlen
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 52e9f04ef..907140cf4 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -4,14 +4,15 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= gdbserver
-PKG_VERSION:= 10.1
+PKG_VERSION:= 11.1
PKG_RELEASE:= 1
-PKG_HASH:= f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
+PKG_HASH:= cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
PKG_DESCR:= remote program debugger utility
PKG_SECTION:= app/debug
PKG_NEEDS:= c++
PKG_SITES:= ${MASTER_SITE_GNU:=gdb/}
-PKG_DEPENDS:= libthread-db
+PKG_DEPENDS:= libthread-db libgmp
+PKG_BUILDDEP:= gmp
PKG_LIBC_DEPENDS:= !musl
PKG_ARCH_DEPENDS:= !microblaze
diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb
index 8a4e3c378..2bf0c8870 100644
--- a/target/config/Config.in.gdb
+++ b/target/config/Config.in.gdb
@@ -21,7 +21,7 @@ choice
prompt "GNU debugger version"
depends on ADK_TOOLCHAIN_WITH_GDB
default ADK_TOOLCHAIN_GDB_H8300_GIT if ADK_TARGET_ARCH_H8300
-default ADK_TOOLCHAIN_GDB_10_1
+default ADK_TOOLCHAIN_GDB_11_1
config ADK_TOOLCHAIN_GDB_GIT
bool "git"
@@ -33,8 +33,8 @@ config ADK_TOOLCHAIN_GDB_H8300_GIT
bool "h8300-git"
depends on ADK_TARGET_ARCH_H8300
-config ADK_TOOLCHAIN_GDB_10_1
- bool "10.1"
+config ADK_TOOLCHAIN_GDB_11_1
+ bool "11.1"
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_H8300
depends on !ADK_TARGET_ARCH_NDS32
diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index f2cd417fe..5f46cb926 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -29,6 +29,7 @@ $(WRKBUILD)/.configured:
--build=$(GNU_HOST_NAME) \
--host=$(GNU_HOST_NAME) \
--target=$(GNU_TARGET_NAME) \
+ --with-libgmp-prefix='${STAGING_HOST_DIR}/usr' \
--disable-dependency-tracking \
--without-uiout \
--enable-gdbmi \
diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc
index 46dff1a59..b12d535f2 100644
--- a/toolchain/gdb/Makefile.inc
+++ b/toolchain/gdb/Makefile.inc
@@ -2,10 +2,10 @@
# material, please see the LICENCE file in the top-level directory.
PKG_NAME:= gdb
-ifeq ($(ADK_TOOLCHAIN_GDB_10_1),y)
-PKG_VERSION:= 10.1
+ifeq ($(ADK_TOOLCHAIN_GDB_11_1),y)
+PKG_VERSION:= 11.1
PKG_RELEASE:= 1
-PKG_HASH:= f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
+PKG_HASH:= cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
PKG_SITES:= ${MASTER_SITE_GNU:=gdb/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 01:00:15 +0000