From 126bb72fa0610c18eed3b62bf5d32ae331bdb9c6 Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Fri, 4 Jul 2008 08:39:35 +0000
Subject: Add prepatched AVR32 gcc-4.2.2 toolchain from www.atmel.no, move
 patch locations for prepatched toolchain to be under the toolchain directory

---
 toolchain/gdb/Config.in |  3 +--
 toolchain/gdb/gdb.mk    | 10 ++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'toolchain/gdb')

diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 9ad2d6822..6bcbfdab4 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -23,7 +23,7 @@ config BR2_PACKAGE_GDB_HOST
 choice
 	prompt "GDB debugger Version"
 	default BR2_GDB_VERSION_6_6 if !BR2_avr32
-	default BR2_GDB_VERSION_6_4 if BR2_avr32
+	default BR2_GDB_VERSION_6_7_1 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.
@@ -50,7 +50,6 @@ choice
 
 	config BR2_GDB_VERSION_6_7_1
 		bool "gdb 6.7.1"
-		depends on !BR2_avr32
 
 	config BR2_GDB_VERSION_6_8
 		bool "gdb 6.8"
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index e8208b428..6220cd9cb 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -27,7 +27,7 @@ GDB_CAT:=$(BZCAT)
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SOURCE),y)
 GDB_SITE:=$(VENDOR_SITE)
-GDB_PATCH_DIR:=$(VENDOR_PATCH_DIR)/gdb-$(GDB_OFFICIAL_VERSION)
+GDB_PATCH_DIR:=toolchain/gdb/ext_source/$(VENDOR_PATCH_DIR)/$(GDB_OFFICIAL_VERSION)
 else
 GDB_SITE:=$(BR2_GNU_MIRROR)/gdb
 GDB_PATCH_DIR:=toolchain/gdb/$(GDB_OFFICIAL_VERSION)
@@ -61,6 +61,12 @@ endif
 	$(CONFIG_UPDATE) $(GDB_DIR)
 	touch $@
 
+gdb-patched: $(GDB_DIR)/.unpacked
+$(GDB_DIR)/.patched: $(GDB_DIR)/.unpacked
+	toolchain/patch-kernel.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch
+	$(CONFIG_UPDATE) $(GDB_DIR)
+	touch $@
+
 gdb-dirclean:
 	rm -rf $(GDB_DIR)
 
@@ -82,7 +88,7 @@ GDB_TARGET_CONFIGURE_VARS:= \
 	bash_cv_func_sigsetjmp=present \
 	bash_cv_have_mbstate_t=yes
 
-$(GDB_TARGET_DIR)/.configured: $(GDB_DIR)/.unpacked
+$(GDB_TARGET_DIR)/.configured: $(GDB_DIR)/.patched
 	mkdir -p $(GDB_TARGET_DIR)
 	(cd $(GDB_TARGET_DIR); \
 		gdb_cv_func_sigsetjmp=yes \
-- 
cgit v1.2.3