From bff6a9c54bc83a017ca1710be827644596b947f0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 12 Jun 2017 00:18:17 +0200 Subject: gdb: add 8.0, remove older 7.x versions --- package/gdb/Makefile | 5 ++--- package/gdbserver/Makefile | 4 ++-- target/config/Config.in.gdb | 19 +++---------------- toolchain/gdb/Makefile.inc | 20 +++----------------- 4 files changed, 10 insertions(+), 38 deletions(-) diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 8f1233aec..00390cbd3 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -4,16 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gdb -PKG_VERSION:= 7.12.1 +PKG_VERSION:= 8.0 PKG_RELEASE:= 1 -PKG_HASH:= 4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186 +PKG_HASH:= f6a24ffe4917e67014ef9273eb8b547cb96a13e5ca74895b06d683b391f3f4ee PKG_DESCR:= programm 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_NEEDS:= c++ -PKG_NOPARALLEL:= 1 PKG_ARCH_DEPENDS:= !cris !m68k !avr32 !nios2 !microblaze !or1k diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 7aa3d20ad..e29865028 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gdbserver -PKG_VERSION:= 7.12.1 +PKG_VERSION:= 8.0 PKG_RELEASE:= 1 -PKG_HASH:= 4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186 +PKG_HASH:= f6a24ffe4917e67014ef9273eb8b547cb96a13e5ca74895b06d683b391f3f4ee PKG_DESCR:= remote programm debugger utility PKG_SECTION:= app/debug PKG_NEEDS:= c++ diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb index 1e0433566..cc0f94e24 100644 --- a/target/config/Config.in.gdb +++ b/target/config/Config.in.gdb @@ -21,8 +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_NDS32 if ADK_TARGET_ARCH_NDS32 -default ADK_TOOLCHAIN_GDB_7_12_1 +default ADK_TOOLCHAIN_GDB_8_0 config ADK_TOOLCHAIN_GDB_GIT bool "git" @@ -34,20 +33,8 @@ config ADK_TOOLCHAIN_GDB_H8300_GIT bool "h8300-git" depends on ADK_TARGET_ARCH_H8300 -config ADK_TOOLCHAIN_GDB_7_12_1 - bool "7.12.1" - depends on !ADK_TARGET_ARCH_AVR32 - depends on !ADK_TARGET_ARCH_H8300 - depends on !ADK_TARGET_ARCH_NDS32 - -config ADK_TOOLCHAIN_GDB_7_11_1 - bool "7.11.1" - depends on !ADK_TARGET_ARCH_AVR32 - depends on !ADK_TARGET_ARCH_H8300 - depends on !ADK_TARGET_ARCH_NDS32 - -config ADK_TOOLCHAIN_GDB_7_10_1 - bool "7.10.1" +config ADK_TOOLCHAIN_GDB_8_0 + bool "8.0" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_H8300 depends on !ADK_TARGET_ARCH_NDS32 diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc index 8fab6df27..419932a72 100644 --- a/toolchain/gdb/Makefile.inc +++ b/toolchain/gdb/Makefile.inc @@ -2,24 +2,10 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= gdb -ifeq ($(ADK_TOOLCHAIN_GDB_7_12_1),y) -PKG_VERSION:= 7.12.1 +ifeq ($(ADK_TOOLCHAIN_GDB_8_0),y) +PKG_VERSION:= 8.0 PKG_RELEASE:= 1 -PKG_HASH:= 4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186 -PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz -endif -ifeq ($(ADK_TOOLCHAIN_GDB_7_11_1),y) -PKG_VERSION:= 7.11.1 -PKG_RELEASE:= 1 -PKG_HASH:= e9216da4e3755e9f414c1aa0026b626251dfc57ffe572a266e98da4f6988fc70 -PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz -endif -ifeq ($(ADK_TOOLCHAIN_GDB_7_10_1),y) -PKG_VERSION:= 7.10.1 -PKG_RELEASE:= 1 -PKG_HASH:= 25c72f3d41c7c8554d61cacbeacd5f40993276d2ccdec43279ac546e3993d6d5 +PKG_HASH:= f6a24ffe4917e67014ef9273eb8b547cb96a13e5ca74895b06d683b391f3f4ee PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz endif -- cgit v1.2.3