Commit f885e239 authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

Revert modification of gcc, and make it AVR32 specific

parent e6382c49

toolchain/gcc/Makefile.in

+6 −0
Original line number Diff line number Diff line
@@ -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

toolchain/gcc/gcc-uclibc-3.x.mk

+1 −3
Original line number Diff line number Diff line
@@ -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) \