From 7f21ead8872279edc517f386025916a9064a409b Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Wed, 1 Aug 2007 08:58:14 +0000
Subject: [PATCH] Simplify AVR32 gcc build (libmudflap, doesn't work, so
 applied even though objections)

---
 toolchain/gcc/Config.in   | 10 ----------
 toolchain/gcc/Config.in.2 | 12 +-----------
 toolchain/gcc/Makefile.in |  4 ++--
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 727b78997a..b00df227a4 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -140,16 +140,6 @@ config BR2_GCC_USE_SJLJ_EXCEPTIONS
 	  proper stack unwinding during exception handling.  Most people
 	  can leave this set to n.
 
-config BR2_GCC_AVR32_CONFIGURATION
-	bool "Enable default AVR32 GCC configuration"
-	default y
-	depends BR2_avr32
-	help
-	  For the AVR32 platform there is some configuration which are not
-	  supported.
-
-	  Currently this will add "--disable-libmudflap" to configure.
-
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
 	string "Additional gcc options"
 	default ""
diff --git a/toolchain/gcc/Config.in.2 b/toolchain/gcc/Config.in.2
index 0b209ec7af..e556392c13 100644
--- a/toolchain/gcc/Config.in.2
+++ b/toolchain/gcc/Config.in.2
@@ -2,19 +2,9 @@ config BR2_PACKAGE_GCC_TARGET
 	bool "native toolchain in the target filesystem"
 	default n
 	help
-	  If you want the target system to be able to run 
+	  If you want the target system to be able to run
 	  binutils/gcc and compile native code, say Y here.
 
-config BR2_GCC_TARGET_AVR32_CONFIGURATION
-	bool "Enable default AVR32 GCC configuration"
-	default y
-	depends BR2_avr32 && BR2_PACKAGE_GCC_TARGET
-	help
-	  For the AVR32 platform there is some configuration which are not
-	  supported.
-
-	  Currently this will add "--disable-libmudflap" to configure.
-
 config BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS
 	string "Additional target gcc options"
 	default ""
diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index ec14b25bd1..b087eb22c5 100644
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -12,7 +12,7 @@ EXTRA_GCC_CONFIG_OPTIONS:=$(strip $(subst ",, $(BR2_EXTRA_GCC_CONFIG_OPTIONS)))
 #"))
 
 # AVR32 GCC configuration
-ifeq ($(strip $(BR2_GCC_AVR32_CONFIGURATION)),y)
+ifeq ($(strip $(BR2_avr32)),y)
 EXTRA_GCC_CONFIG_OPTIONS+=--disable-libmudflap
 endif
 
@@ -86,7 +86,7 @@ endif
 endif # BR2_PREFER_IMA=y
 
 # AVR32 target GCC configuration
-ifeq ($(strip $(BR2_GCC_TARGET_AVR32_CONFIGURATION)),y)
+ifeq ($(strip $(BR2_avr32)),y)
 EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--disable-libmudflap
 endif
 
-- 
2.30.2