From f37da1684f5ecc03ffadf85e9eca01d8c378a1c7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 10 Jun 2015 10:54:21 -0500 Subject: update gdb, enable sim only for supported architectures --- target/config/Config.in.gdb.choice | 6 +++--- toolchain/gdb/Makefile | 6 ++++++ toolchain/gdb/Makefile.inc | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/target/config/Config.in.gdb.choice b/target/config/Config.in.gdb.choice index 4e808cdd8..6b369f0f8 100644 --- a/target/config/Config.in.gdb.choice +++ b/target/config/Config.in.gdb.choice @@ -1,13 +1,13 @@ choice prompt "GNU debugger version" -default ADK_TOOLCHAIN_GDB_7_9 +default ADK_TOOLCHAIN_GDB_7_9_1 config ADK_TOOLCHAIN_GDB_GIT bool "git" depends on !ADK_TARGET_ARCH_AVR32 -config ADK_TOOLCHAIN_GDB_7_9 - bool "7.9" +config ADK_TOOLCHAIN_GDB_7_9_1 + bool "7.9.1" depends on !ADK_TARGET_ARCH_AVR32 config ADK_TOOLCHAIN_GDB_7_8_2 diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index b3538a75d..8d9455629 100644 --- a/toolchain/gdb/Makefile +++ b/toolchain/gdb/Makefile @@ -15,6 +15,12 @@ else CONFIGURE_ARGS:= --disable-sim endif +ifeq ($(ADK_TARGET_SIM),y) +CONFIGURE_ARGS:= --enable-sim +else +CONFIGURE_ARGS:= --disable-sim +endif + $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: $(SED) 's/install_to_$(INSTALL_DEST) //' ${WRKBUILD}/libiberty/Makefile.in diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc index 9ba9ea85e..800c944dc 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_7_9),y) -PKG_VERSION:= 7.9 +ifeq ($(ADK_TOOLCHAIN_GDB_7_9_1),y) +PKG_VERSION:= 7.9.1 PKG_RELEASE:= 1 -PKG_HASH:= 9b315651a16528f7af8c7d8284699fb0c965df316cc7339bb0b7bae335848392 +PKG_HASH:= cd9c543a411a05b2b647dd38936034b68c2b5d6f10e0d51dc168c166c973ba40 PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz endif -- cgit v1.2.3