diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-26 21:12:38 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-26 21:12:38 +0000 |
| commit | 4b0d5a80f8b38bf9a264584ffc90b901f82c8cbb (patch) | |
| tree | 56762054e7ac277378262dd98c4ff8c9c55a7d1e /toolchain/gdb | |
| parent | 02f18650097aed6c71f704c38c4dc55039286248 (diff) | |
- revert some bad checkins, fixup bad settings in atmel targets and move the gcc target abi back to a place where the other arch-specific settings live
Diffstat (limited to 'toolchain/gdb')
| -rw-r--r-- | toolchain/gdb/Config.in | 3 | ||||
| -rw-r--r-- | toolchain/gdb/gdb.mk | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in index 31aeca989..802624f77 100644 --- a/toolchain/gdb/Config.in +++ b/toolchain/gdb/Config.in @@ -22,7 +22,8 @@ config BR2_PACKAGE_GDB_HOST choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_6_6 + default BR2_GDB_VERSION_6_6 if !BR2_avr32 + default BR2_GDB_VERSION_6_4 if BR2_avr32 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST help Select the version of gdb you wish to use. diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index 6486f874b..58934b846 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -3,7 +3,7 @@ # gdb # ###################################################################### -ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) +ifeq ($(BR2_TOOLCHAIN_SOURCE),y) GDB_VERSION:=$(strip $(subst ",, $(BR2_GDB_VERSION))) #")) else @@ -20,7 +20,7 @@ GDB_DIR:=$(TOOL_BUILD_DIR)/gdb-$(GDB_VERSION) GDB_PATCH_DIR:=toolchain/gdb/$(GDB_VERSION) else -ifeq ($(BR2_TOOLCHAIN_NORMAL),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) GDB_SITE:=http://ftp.gnu.org/gnu/gdb else GDB_SITE:=$(VENDOR_SITE) @@ -31,7 +31,7 @@ GDB_OFFICIAL_VERSION:=$(GDB_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GDB_RELEASE) GDB_SOURCE:=gdb-$(GDB_OFFICIAL_VERSION).tar.bz2 GDB_CAT:=$(BZCAT) -ifeq ($(BR2_TOOLCHAIN_NORMAL),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) GDB_PATCH_DIR:=toolchain/gdb/$(GDB_OFFICIAL_VERSION) else GDB_PATCH_DIR:=$(VENDOR_PATCH_DIR)/gdb-$(GDB_OFFICIAL_VERSION) |