Revert modification of gcc, and make it AVR32 specific

diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index 01a0e95608b25deed56defb24ed34b886d5c714a..e12f29daadf3ae9f5f1345a04a9417281ca91e74 100644 (file)
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -14,6 +14,9 @@ EXTRA_GCC_CONFIG_OPTIONS:=$(strip $(subst ",, $(BR2_EXTRA_GCC_CONFIG_OPTIONS)))
 # AVR32 GCC configuration
 ifeq ($(strip $(BR2_avr32)),y)
 EXTRA_GCC_CONFIG_OPTIONS+=--disable-libmudflap
+EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--disable-libssp
+EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin \
+#EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--with-as=$(TARGET_CROSS)as
 endif
 
 ifeq ($(strip $(subst ",, $(BR2_GCC_IS_SNAP))),y)
@@ -79,6 +82,9 @@ EXTRA_TARGET_GCC_CONFIG_OPTIONS:=
 # AVR32 target GCC configuration
 ifeq ($(strip $(BR2_avr32)),y)
 EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--disable-libmudflap
+EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--disable-libssp
+EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin \
+#EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--with-as=$(TARGET_CROSS)as
 endif
 
 

diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index 733dbe6badfa4f2229c992af4f1441031cc3c7c7..db7c9064c90c727771dac8f7ccd3a95e0981ca0d 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -187,7 +187,6 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
                --disable-__cxa_atexit \
                --enable-target-optspace \
                --with-gnu-ld \
-               --with-as=$(TARGET_CROSS)as \
                --disable-shared \
                $(GCC_WITH_HOST_GMP) \
                $(GCC_WITH_HOST_MPFR) \
@@ -252,8 +251,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)
                --enable-languages=$(GCC_CROSS_LANGUAGES) \
                --disable-__cxa_atexit \
                --enable-target-optspace \
-               --with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin \
-               --disable-libssp \
+               --with-gnu-ld \
                $(GCC_WITH_HOST_GMP) \
                $(GCC_WITH_HOST_MPFR) \
                $(GCC_SHARED_LIBGCC) \